Moved key value components to new keyvalue package

mooncloak · Feb 25, 2025 · 3898340 · 3898340
1 parent c7f07eb
commit 3898340
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 15 deletions.
diff --git a/.../src/androidMain/kotlin/com.mooncloak.vpn.app.shared/di/AndroidApplicationDependencies.kt b/.../src/androidMain/kotlin/com.mooncloak.vpn.app.shared/di/AndroidApplicationDependencies.kt
@@ -12,7 +12,7 @@ import com.mooncloak.vpn.app.shared.storage.database.DatabaseDriverFactory
 import com.mooncloak.vpn.app.shared.util.ApplicationContext
 import com.mooncloak.vpn.app.shared.util.coroutine.ApplicationCoroutineScope
 import com.mooncloak.vpn.app.shared.util.notification.NotificationManager
-import com.mooncloak.vpn.data.shared.MutableKeyValueStorage
+import com.mooncloak.vpn.data.shared.keyvalue.MutableKeyValueStorage
 import io.ktor.client.HttpClient
 import kotlinx.datetime.Clock
 import kotlinx.serialization.json.Json

diff --git a/app-shared/src/commonMain/kotlin/com/mooncloak/vpn/app/shared/di/ApplicationComponent.kt b/app-shared/src/commonMain/kotlin/com/mooncloak/vpn/app/shared/di/ApplicationComponent.kt
@@ -24,8 +24,8 @@ import com.mooncloak.vpn.app.shared.util.http.DefaultUnauthorizedInterceptor
 import com.mooncloak.vpn.app.shared.util.http.UnauthorizedInterceptor
 import com.mooncloak.vpn.app.shared.util.http.interceptUnauthorized
 import com.mooncloak.vpn.app.storage.sqlite.database.MooncloakDatabase
-import com.mooncloak.vpn.data.shared.MutableKeyValueStorage
-import com.mooncloak.vpn.data.shared.SettingsKeyValueStorage
+import com.mooncloak.vpn.data.shared.keyvalue.MutableKeyValueStorage
+import com.mooncloak.vpn.data.shared.keyvalue.SettingsKeyValueStorage
 import com.russhwolf.settings.Settings
 import io.ktor.client.HttpClient
 import io.ktor.client.plugins.compression.ContentEncoding

diff --git a/app-shared/src/commonMain/kotlin/com/mooncloak/vpn/app/shared/di/ApplicationDependencies.kt b/app-shared/src/commonMain/kotlin/com/mooncloak/vpn/app/shared/di/ApplicationDependencies.kt
@@ -11,7 +11,7 @@ import com.mooncloak.vpn.app.shared.storage.PreferencesStorage
 import com.mooncloak.vpn.app.shared.storage.database.DatabaseDriverFactory
 import com.mooncloak.vpn.app.shared.util.coroutine.ApplicationCoroutineScope
 import com.mooncloak.vpn.app.shared.util.notification.NotificationManager
-import com.mooncloak.vpn.data.shared.MutableKeyValueStorage
+import com.mooncloak.vpn.data.shared.keyvalue.MutableKeyValueStorage
 import io.ktor.client.HttpClient
 import kotlinx.datetime.Clock
 import kotlinx.serialization.json.Json

diff --git a/app-shared/src/commonMain/kotlin/com/mooncloak/vpn/app/shared/storage/SubscriptionStorage.kt b/app-shared/src/commonMain/kotlin/com/mooncloak/vpn/app/shared/storage/SubscriptionStorage.kt
@@ -4,10 +4,9 @@ import com.mooncloak.kodetools.konstruct.annotations.Inject
 import com.mooncloak.kodetools.konstruct.annotations.Singleton
 import com.mooncloak.vpn.api.shared.service.ServiceSubscription
 import com.mooncloak.vpn.api.shared.service.ServiceTokens
-import com.mooncloak.vpn.data.shared.KeyValueProperty
-import com.mooncloak.vpn.data.shared.MutableKeyValueProperty
-import com.mooncloak.vpn.data.shared.MutableKeyValueStorage
-import com.mooncloak.vpn.data.shared.property
+import com.mooncloak.vpn.data.shared.keyvalue.MutableKeyValueProperty
+import com.mooncloak.vpn.data.shared.keyvalue.MutableKeyValueStorage
+import com.mooncloak.vpn.data.shared.keyvalue.property
 
 @Singleton
 public class SubscriptionStorage @Inject public constructor(

diff --git a/app-shared/src/jvmMain/kotlin/com/mooncloak/vpn/app/shared/di/JvmApplicationDependencies.kt b/app-shared/src/jvmMain/kotlin/com/mooncloak/vpn/app/shared/di/JvmApplicationDependencies.kt
@@ -11,7 +11,7 @@ import com.mooncloak.vpn.app.shared.storage.PreferencesStorage
 import com.mooncloak.vpn.app.shared.storage.database.DatabaseDriverFactory
 import com.mooncloak.vpn.app.shared.util.coroutine.ApplicationCoroutineScope
 import com.mooncloak.vpn.app.shared.util.notification.NotificationManager
-import com.mooncloak.vpn.data.shared.MutableKeyValueStorage
+import com.mooncloak.vpn.data.shared.keyvalue.MutableKeyValueStorage
 import io.ktor.client.HttpClient
 import kotlinx.datetime.Clock
 import kotlinx.serialization.json.Json

diff --git a/...pn/data/shared/DefaultKeyValueProperty.kt → ...hared/keyvalue/DefaultKeyValueProperty.kt b/...pn/data/shared/DefaultKeyValueProperty.kt → ...hared/keyvalue/DefaultKeyValueProperty.kt
@@ -1,4 +1,4 @@
-package com.mooncloak.vpn.data.shared
+package com.mooncloak.vpn.data.shared.keyvalue
 
 import kotlinx.coroutines.flow.Flow
 import kotlinx.serialization.KSerializer

diff --git a/...pn/data/shared/InMemoryKeyValueStorage.kt → ...hared/keyvalue/InMemoryKeyValueStorage.kt b/...pn/data/shared/InMemoryKeyValueStorage.kt → ...hared/keyvalue/InMemoryKeyValueStorage.kt
@@ -1,4 +1,4 @@
-package com.mooncloak.vpn.data.shared
+package com.mooncloak.vpn.data.shared.keyvalue
 
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow

diff --git a/...loak/vpn/data/shared/KeyValueDelegates.kt → ...data/shared/keyvalue/KeyValueDelegates.kt b/...loak/vpn/data/shared/KeyValueDelegates.kt → ...data/shared/keyvalue/KeyValueDelegates.kt
@@ -1,4 +1,4 @@
-package com.mooncloak.vpn.data.shared
+package com.mooncloak.vpn.data.shared.keyvalue
 
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.serializer

diff --git a/...cloak/vpn/data/shared/KeyValueProperty.kt → .../data/shared/keyvalue/KeyValueProperty.kt b/...cloak/vpn/data/shared/KeyValueProperty.kt → .../data/shared/keyvalue/KeyValueProperty.kt
@@ -1,4 +1,4 @@
-package com.mooncloak.vpn.data.shared
+package com.mooncloak.vpn.data.shared.keyvalue
 
 import kotlinx.coroutines.flow.Flow
 

diff --git a/...ncloak/vpn/data/shared/KeyValueStorage.kt → ...n/data/shared/keyvalue/KeyValueStorage.kt b/...ncloak/vpn/data/shared/KeyValueStorage.kt → ...n/data/shared/keyvalue/KeyValueStorage.kt
@@ -1,4 +1,4 @@
-package com.mooncloak.vpn.data.shared
+package com.mooncloak.vpn.data.shared.keyvalue
 
 import kotlinx.coroutines.flow.Flow
 import kotlinx.serialization.KSerializer

diff --git a/...pn/data/shared/SettingsKeyValueStorage.kt → ...hared/keyvalue/SettingsKeyValueStorage.kt b/...pn/data/shared/SettingsKeyValueStorage.kt → ...hared/keyvalue/SettingsKeyValueStorage.kt
@@ -1,4 +1,4 @@
-package com.mooncloak.vpn.data.shared
+package com.mooncloak.vpn.data.shared.keyvalue
 
 import com.russhwolf.settings.ExperimentalSettingsApi
 import com.russhwolf.settings.Settings