瀏覽代碼

Updated sqldelight version

Vadik Sirekanyan 2 年之前
父節點
當前提交
0e3901f57d
共有 3 個文件被更改,包括 13 次插入10 次删除
  1. 7 5
      app/build.gradle.kts
  2. 5 4
      app/src/main/java/org/sirekanyan/outline/db/ApiUrlDao.kt
  3. 1 1
      build.gradle.kts

+ 7 - 5
app/build.gradle.kts

@@ -2,7 +2,7 @@ plugins {
     id("com.android.application")
     kotlin("android")
     kotlin("plugin.serialization")
-    id("com.squareup.sqldelight")
+    id("app.cash.sqldelight")
     id("org.sirekanyan.version-checker")
 }
 
@@ -65,13 +65,15 @@ dependencies {
     implementation("org.slf4j:slf4j-simple:2.0.7")
 
     // sqldelight
-    implementation("com.squareup.sqldelight:android-driver:1.5.5")
-    implementation("com.squareup.sqldelight:coroutines-extensions:1.5.5")
+    implementation("app.cash.sqldelight:android-driver:2.0.0")
+    implementation("app.cash.sqldelight:coroutines-extensions:2.0.0")
 
 }
 
 sqldelight {
-    database("OutlineDatabase") {
-        packageName = "org.sirekanyan.outline.db"
+    databases {
+        create("OutlineDatabase") {
+            packageName.set("org.sirekanyan.outline.db")
+        }
     }
 }

+ 5 - 4
app/src/main/java/org/sirekanyan/outline/db/ApiUrlDao.kt

@@ -4,9 +4,10 @@ import android.app.Application
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.platform.LocalContext
-import com.squareup.sqldelight.android.AndroidSqliteDriver
-import com.squareup.sqldelight.runtime.coroutines.asFlow
-import com.squareup.sqldelight.runtime.coroutines.mapToList
+import app.cash.sqldelight.driver.android.AndroidSqliteDriver
+import app.cash.sqldelight.coroutines.asFlow
+import app.cash.sqldelight.coroutines.mapToList
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.Flow
 
 @Composable
@@ -21,7 +22,7 @@ class ApiUrlDao(app: Application) {
     private val queries = OutlineDatabase(driver).apiUrlQueries
 
     fun observeUrls(): Flow<List<String>> =
-        queries.selectUrls().asFlow().mapToList()
+        queries.selectUrls().asFlow().mapToList(Dispatchers.IO)
 
     fun insertUrl(id: String) {
         queries.insertUrl(id)

+ 1 - 1
build.gradle.kts

@@ -3,6 +3,6 @@ plugins {
     id("com.android.application") version "8.1.0" apply false
     kotlin("android") version kotlinVersion apply false
     kotlin("plugin.serialization") version kotlinVersion apply false
-    id("com.squareup.sqldelight") version "1.5.5" apply false
+    id("app.cash.sqldelight") version "2.0.0" apply false
     id("org.sirekanyan.version-checker") version "1.0.7" apply false
 }