Upgrading SQLDelight

groupeminaste · Jan 14, 2024 · 846ba04 · 846ba04
1 parent feb5f26
commit 846ba04
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 21 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -8,6 +8,7 @@ plugins {
     id("org.jetbrains.kotlinx.kover").version("0.7.4")
     id("com.google.devtools.ksp").version("1.9.20-1.0.13").apply(false)
     id("org.jetbrains.compose").version("1.5.10").apply(false)
+    id("app.cash.sqldelight").version("2.0.0").apply(false)
     id("com.rickclephas.kmp.nativecoroutines").version("1.0.0-ALPHA-19").apply(false)
 }
 
@@ -19,14 +20,6 @@ allprojects {
     }
 }
 
-buildscript {
-    val sqlDelightVersion = "1.5.3"
-
-    dependencies {
-        classpath("com.squareup.sqldelight:gradle-plugin:$sqlDelightVersion")
-    }
-}
-
 tasks.register("clean", Delete::class) {
     delete(rootProject.buildDir)
 }
diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
     kotlin("plugin.serialization")
     id("org.jetbrains.kotlinx.kover")
     id("com.google.devtools.ksp")
-    id("com.squareup.sqldelight")
+    id("app.cash.sqldelight")
     id("com.rickclephas.kmp.nativecoroutines")
 }
 
@@ -25,7 +25,7 @@ kotlin {
     val coroutinesVersion = "1.7.3"
     val ktorVersion = "2.3.7"
     val koinVersion = "3.5.3"
-    val sqlDelightVersion = "1.5.3"
+    val sqlDelightVersion = "2.0.0"
 
     sourceSets {
         all {
@@ -44,7 +44,7 @@ kotlin {
                 implementation("io.insert-koin:koin-core:$koinVersion")
                 implementation("io.sentry:sentry-kotlin-multiplatform:0.2.1")
 
-                implementation("com.squareup.sqldelight:runtime:$sqlDelightVersion")
+                implementation("app.cash.sqldelight:runtime:$sqlDelightVersion")
 
                 api("com.rickclephas.kmm:kmm-viewmodel-core:1.0.0-ALPHA-16")
                 api("org.jetbrains.kotlinx:kotlinx-datetime:0.5.0")
@@ -56,7 +56,7 @@ kotlin {
         val androidMain by getting {
             dependencies {
                 implementation("io.ktor:ktor-client-android:$ktorVersion")
-                implementation("com.squareup.sqldelight:android-driver:$sqlDelightVersion")
+                implementation("app.cash.sqldelight:android-driver:$sqlDelightVersion")
             }
         }
         val androidUnitTest by getting {
@@ -75,7 +75,7 @@ kotlin {
             iosSimulatorArm64Main.dependsOn(this)
             dependencies {
                 implementation("io.ktor:ktor-client-darwin:$ktorVersion")
-                implementation("com.squareup.sqldelight:native-driver:$sqlDelightVersion")
+                implementation("app.cash.sqldelight:native-driver:$sqlDelightVersion")
             }
         }
         val iosX64Test by getting
@@ -109,7 +109,9 @@ koverReport {
 }
 
 sqldelight {
-    database("AppDatabase") {
-        packageName = "me.nathanfallet.extopy.database"
+    databases {
+        create("AppDatabase") {
+            packageName.set("me.nathanfallet.extopy.database")
+        }
     }
 }
diff --git a/shared/src/androidMain/kotlin/me/nathanfallet/extopy/database/DatabaseDriverFactory.kt b/shared/src/androidMain/kotlin/me/nathanfallet/extopy/database/DatabaseDriverFactory.kt
@@ -1,8 +1,8 @@
 package me.nathanfallet.extopy.database
 
 import android.content.Context
-import com.squareup.sqldelight.android.AndroidSqliteDriver
-import com.squareup.sqldelight.db.SqlDriver
+import app.cash.sqldelight.db.SqlDriver
+import app.cash.sqldelight.driver.android.AndroidSqliteDriver
 
 actual class DatabaseDriverFactory(private val context: Context) {
     actual fun createDriver(): SqlDriver {

diff --git a/shared/src/commonMain/kotlin/me/nathanfallet/extopy/database/Database.kt b/shared/src/commonMain/kotlin/me/nathanfallet/extopy/database/Database.kt
@@ -3,6 +3,6 @@ package me.nathanfallet.extopy.database
 class Database(databaseDriverFactory: DatabaseDriverFactory) {
 
     private val database = AppDatabase(databaseDriverFactory.createDriver())
-    private val dbQuery = database.appDatabaseQueries
+    //private val dbQuery = database.appDatabaseQueries
 
 }
diff --git a/shared/src/commonMain/kotlin/me/nathanfallet/extopy/database/DatabaseDriverFactory.kt b/shared/src/commonMain/kotlin/me/nathanfallet/extopy/database/DatabaseDriverFactory.kt
@@ -1,6 +1,6 @@
 package me.nathanfallet.extopy.database
 
-import com.squareup.sqldelight.db.SqlDriver
+import app.cash.sqldelight.db.SqlDriver
 
 expect class DatabaseDriverFactory {
 

diff --git a/shared/src/iosMain/kotlin/me/nathanfallet/extopy/database/DatabaseDriverFactory.kt b/shared/src/iosMain/kotlin/me/nathanfallet/extopy/database/DatabaseDriverFactory.kt
@@ -1,7 +1,7 @@
 package me.nathanfallet.extopy.database
 
-import com.squareup.sqldelight.db.SqlDriver
-import com.squareup.sqldelight.drivers.native.NativeSqliteDriver
+import app.cash.sqldelight.db.SqlDriver
+import app.cash.sqldelight.driver.native.NativeSqliteDriver
 
 actual class DatabaseDriverFactory {