From ccf4cc1bc47b5afbe919d7221aec18541e5e7ae2 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Mon, 6 Mar 2023 13:04:54 +0100 Subject: [PATCH] Move `InMemorySessionStore` in it's own module implementation --- .../impl-memory/build.gradle.kts | 28 +++++++++++++++++++ .../impl/memory}/InMemorySessionStore.kt | 2 +- samples/minimal/build.gradle.kts | 1 + .../android/samples/minimal/MainActivity.kt | 1 + settings.gradle.kts | 1 + 5 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 libraries/session-storage/impl-memory/build.gradle.kts rename {samples/minimal/src/main/kotlin/io/element/android/samples/minimal => libraries/session-storage/impl-memory/src/main/kotlin/io/element/android/libraries/sessionstorage/impl/memory}/InMemorySessionStore.kt (96%) diff --git a/libraries/session-storage/impl-memory/build.gradle.kts b/libraries/session-storage/impl-memory/build.gradle.kts new file mode 100644 index 0000000000..ec1d618962 --- /dev/null +++ b/libraries/session-storage/impl-memory/build.gradle.kts @@ -0,0 +1,28 @@ +/* + * Copyright (c) 2023 New Vector Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +plugins { + id("io.element.android-library") +} + +android { + namespace = "io.element.android.libraries.sessionstorage.impl.memory" +} + +dependencies { + implementation(projects.libraries.sessionStorage.api) + implementation(libs.coroutines.core) +} diff --git a/samples/minimal/src/main/kotlin/io/element/android/samples/minimal/InMemorySessionStore.kt b/libraries/session-storage/impl-memory/src/main/kotlin/io/element/android/libraries/sessionstorage/impl/memory/InMemorySessionStore.kt similarity index 96% rename from samples/minimal/src/main/kotlin/io/element/android/samples/minimal/InMemorySessionStore.kt rename to libraries/session-storage/impl-memory/src/main/kotlin/io/element/android/libraries/sessionstorage/impl/memory/InMemorySessionStore.kt index 589e5d8804..b73ffdeb9a 100644 --- a/samples/minimal/src/main/kotlin/io/element/android/samples/minimal/InMemorySessionStore.kt +++ b/libraries/session-storage/impl-memory/src/main/kotlin/io/element/android/libraries/sessionstorage/impl/memory/InMemorySessionStore.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.samples.minimal +package io.element.android.libraries.sessionstorage.impl.memory import io.element.android.libraries.sessionstorage.api.SessionData import io.element.android.libraries.sessionstorage.api.SessionStore diff --git a/samples/minimal/build.gradle.kts b/samples/minimal/build.gradle.kts index 7271b295e5..a7da2a94c8 100644 --- a/samples/minimal/build.gradle.kts +++ b/samples/minimal/build.gradle.kts @@ -49,6 +49,7 @@ dependencies { implementation(libs.androidx.activity.compose) implementation(projects.libraries.matrix.api) implementation(projects.libraries.matrix.impl) + implementation(projects.libraries.sessionStorage.implMemory) implementation(projects.libraries.designsystem) implementation(projects.libraries.architecture) implementation(projects.libraries.core) diff --git a/samples/minimal/src/main/kotlin/io/element/android/samples/minimal/MainActivity.kt b/samples/minimal/src/main/kotlin/io/element/android/samples/minimal/MainActivity.kt index bdf2818519..4ba66c51d6 100644 --- a/samples/minimal/src/main/kotlin/io/element/android/samples/minimal/MainActivity.kt +++ b/samples/minimal/src/main/kotlin/io/element/android/samples/minimal/MainActivity.kt @@ -31,6 +31,7 @@ import androidx.core.view.WindowCompat import io.element.android.libraries.designsystem.theme.ElementTheme import io.element.android.libraries.matrix.api.auth.MatrixAuthenticationService import io.element.android.libraries.matrix.impl.auth.RustMatrixAuthenticationService +import io.element.android.libraries.sessionstorage.impl.memory.InMemorySessionStore import kotlinx.coroutines.runBlocking import org.matrix.rustcomponents.sdk.AuthenticationService import java.io.File diff --git a/settings.gradle.kts b/settings.gradle.kts index 10b255748b..77751aeda1 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -69,3 +69,4 @@ include(":samples:minimal") include(":libraries:encrypted-db") include(":libraries:session-storage:api") include(":libraries:session-storage:impl") +include(":libraries:session-storage:impl-memory")