Moved database adapters into data-shared module

mooncloak · Feb 25, 2025 · 795d717 · 795d717
1 parent f4eaadd
commit 795d717
Show file tree

Hide file tree

Showing 13 changed files with 20 additions and 15 deletions.
diff --git a/...monMain/kotlin/com/mooncloak/vpn/app/shared/storage/database/MooncloakDatabaseProvider.kt b/...monMain/kotlin/com/mooncloak/vpn/app/shared/storage/database/MooncloakDatabaseProvider.kt
@@ -3,10 +3,10 @@ package com.mooncloak.vpn.app.shared.storage.database
 import app.cash.sqldelight.db.SqlDriver
 import com.mooncloak.kodetools.konstruct.annotations.Inject
 import com.mooncloak.kodetools.konstruct.annotations.Singleton
-import com.mooncloak.vpn.app.shared.storage.database.adapter.DatabaseAdapter
-import com.mooncloak.vpn.app.shared.storage.database.adapter.instantAsMillisecondsLong
-import com.mooncloak.vpn.app.shared.storage.database.adapter.jsonElementAsString
-import com.mooncloak.vpn.app.shared.storage.database.adapter.jsonObjectAsString
+import com.mooncloak.vpn.data.shared.database.adapter.DatabaseAdapter
+import com.mooncloak.vpn.data.shared.database.adapter.instantAsMillisecondsLong
+import com.mooncloak.vpn.data.shared.database.adapter.jsonElementAsString
+import com.mooncloak.vpn.data.shared.database.adapter.jsonObjectAsString
 import com.mooncloak.vpn.app.storage.sqlite.database.MooncloakDatabase
 import com.mooncloak.vpn.app.storage.sqlite.database.PurchaseReceipt
 import com.mooncloak.vpn.app.storage.sqlite.database.RegisteredClient

diff --git a/data-shared/build.gradle.kts b/data-shared/build.gradle.kts
@@ -45,6 +45,11 @@ kotlin {
                 api(RussHWolf.multiplatformSettings.noArg)
                 implementation(RussHWolf.multiplatformSettings.coroutines)
                 implementation(RussHWolf.multiplatformSettings.serialization)
+
+                // Database - Sqlite - SqlDelight
+                // https://sqldelight.github.io/sqldelight/2.0.2/multiplatform_sqlite/
+                api("app.cash.sqldelight:coroutines-extensions:_")
+                api("app.cash.sqldelight:primitive-adapters:_")
             }
         }
 

diff --git a/...se/adapter/BooleanAsIntDatabaseAdapter.kt → ...se/adapter/BooleanAsIntDatabaseAdapter.kt b/...se/adapter/BooleanAsIntDatabaseAdapter.kt → ...se/adapter/BooleanAsIntDatabaseAdapter.kt
@@ -1,4 +1,4 @@
-package com.mooncloak.vpn.app.shared.storage.database.adapter
+package com.mooncloak.vpn.data.shared.database.adapter
 
 import app.cash.sqldelight.ColumnAdapter
 

diff --git a/...orage/database/adapter/DatabaseAdapter.kt → ...hared/database/adapter/DatabaseAdapter.kt b/...orage/database/adapter/DatabaseAdapter.kt → ...hared/database/adapter/DatabaseAdapter.kt
@@ -1,4 +1,4 @@
-package com.mooncloak.vpn.app.shared.storage.database.adapter
+package com.mooncloak.vpn.data.shared.database.adapter
 
 import app.cash.sqldelight.ColumnAdapter
 import app.cash.sqldelight.adapter.primitive.FloatColumnAdapter

diff --git a/...pter/InstantAsIsoStringDatabaseAdapter.kt → ...pter/InstantAsIsoStringDatabaseAdapter.kt b/...pter/InstantAsIsoStringDatabaseAdapter.kt → ...pter/InstantAsIsoStringDatabaseAdapter.kt
@@ -1,4 +1,4 @@
-package com.mooncloak.vpn.app.shared.storage.database.adapter
+package com.mooncloak.vpn.data.shared.database.adapter
 
 import app.cash.sqldelight.ColumnAdapter
 import kotlinx.datetime.Instant

diff --git a/...stantAsMillisecondsLongDatabaseAdapter.kt → ...stantAsMillisecondsLongDatabaseAdapter.kt b/...stantAsMillisecondsLongDatabaseAdapter.kt → ...stantAsMillisecondsLongDatabaseAdapter.kt
@@ -1,4 +1,4 @@
-package com.mooncloak.vpn.app.shared.storage.database.adapter
+package com.mooncloak.vpn.data.shared.database.adapter
 
 import app.cash.sqldelight.ColumnAdapter
 import kotlinx.datetime.Instant

diff --git a/...ase/adapter/JsonElementDatabaseAdapter.kt → ...ase/adapter/JsonElementDatabaseAdapter.kt b/...ase/adapter/JsonElementDatabaseAdapter.kt → ...ase/adapter/JsonElementDatabaseAdapter.kt
@@ -1,4 +1,4 @@
-package com.mooncloak.vpn.app.shared.storage.database.adapter
+package com.mooncloak.vpn.data.shared.database.adapter
 
 import app.cash.sqldelight.ColumnAdapter
 import kotlinx.serialization.json.Json

diff --git a/...pter/JsonObjectAsStringDatabaseAdapter.kt → ...pter/JsonObjectAsStringDatabaseAdapter.kt b/...pter/JsonObjectAsStringDatabaseAdapter.kt → ...pter/JsonObjectAsStringDatabaseAdapter.kt
@@ -1,4 +1,4 @@
-package com.mooncloak.vpn.app.shared.storage.database.adapter
+package com.mooncloak.vpn.data.shared.database.adapter
 
 import app.cash.sqldelight.ColumnAdapter
 import kotlinx.serialization.json.Json

diff --git a/...lizableValueAsByteArrayDatabaseAdapter.kt → ...lizableValueAsByteArrayDatabaseAdapter.kt b/...lizableValueAsByteArrayDatabaseAdapter.kt → ...lizableValueAsByteArrayDatabaseAdapter.kt
@@ -1,4 +1,4 @@
-package com.mooncloak.vpn.app.shared.storage.database.adapter
+package com.mooncloak.vpn.data.shared.database.adapter
 
 import app.cash.sqldelight.ColumnAdapter
 import kotlinx.serialization.BinaryFormat

diff --git a/...rializableValueAsStringDatabaseAdapter.kt → ...rializableValueAsStringDatabaseAdapter.kt b/...rializableValueAsStringDatabaseAdapter.kt → ...rializableValueAsStringDatabaseAdapter.kt
@@ -1,4 +1,4 @@
-package com.mooncloak.vpn.app.shared.storage.database.adapter
+package com.mooncloak.vpn.data.shared.database.adapter
 
 import app.cash.sqldelight.ColumnAdapter
 import kotlinx.serialization.KSerializer

diff --git a/...adapter/UuidAsByteArrayDatabaseAdapter.kt → ...adapter/UuidAsByteArrayDatabaseAdapter.kt b/...adapter/UuidAsByteArrayDatabaseAdapter.kt → ...adapter/UuidAsByteArrayDatabaseAdapter.kt
@@ -1,4 +1,4 @@
-package com.mooncloak.vpn.app.shared.storage.database.adapter
+package com.mooncloak.vpn.data.shared.database.adapter
 
 import app.cash.sqldelight.ColumnAdapter
 import kotlin.uuid.ExperimentalUuidApi

diff --git a/...adapter/UuidAsHexStringDatabaseAdapter.kt → ...adapter/UuidAsHexStringDatabaseAdapter.kt b/...adapter/UuidAsHexStringDatabaseAdapter.kt → ...adapter/UuidAsHexStringDatabaseAdapter.kt
@@ -1,4 +1,4 @@
-package com.mooncloak.vpn.app.shared.storage.database.adapter
+package com.mooncloak.vpn.data.shared.database.adapter
 
 import app.cash.sqldelight.ColumnAdapter
 import kotlin.uuid.ExperimentalUuidApi

diff --git a/...se/adapter/UuidAsStringDatabaseAdapter.kt → ...se/adapter/UuidAsStringDatabaseAdapter.kt b/...se/adapter/UuidAsStringDatabaseAdapter.kt → ...se/adapter/UuidAsStringDatabaseAdapter.kt
@@ -1,4 +1,4 @@
-package com.mooncloak.vpn.app.shared.storage.database.adapter
+package com.mooncloak.vpn.data.shared.database.adapter
 
 import app.cash.sqldelight.ColumnAdapter
 import kotlin.uuid.ExperimentalUuidApi