cleanup requery

Author: stevensJourney

build.gradle.kts

@@ -27,9 +27,6 @@ allprojects {
         maven("https://cache-redirector.jetbrains.com/intellij-dependencies")
         // Repo for the backported Android IntelliJ Plugin by Jetbrains used in Ultimate
         maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-ide-plugin-dependencies/")
-        maven("https://jitpack.io") {
-            content { includeGroup("com.github.requery") }
-        }
     }
 
     configurations.configureEach {

core/README.md

@@ -8,9 +8,10 @@ This is a Kotlin Multiplatform project targeting Android, iOS platforms, with th
 
 - `commonMain` - Shared code for all targets, which includes the `PowerSyncBackendConnector` interface and `PowerSyncBuilder` for building a `PowerSync` instance. It also defines
   the `DatabaseDriverFactory` class to be implemented in each platform.
-- `androidMain` - Android specific code, which includes a implementation of `DatabaseDriverFactory` class that creates an instance of `app.cash.sqldelight.driver.android.AndroidSqliteDriver` using
-  a `io.requery.android.database.sqlite.RequerySQLiteOpenHelperFactory`. It also includes native SQLite bindings for Android.
-- `iosMain` - iOS specific code, which includes a implementation of `DatabaseDriverFactory` class that creates an instance of `app.cash.sqldelight.driver.native.NativeSqliteDriver` and also sets up native SQLite bindings for iOS.
+- `commonJDBC` - A Java SQLite driver using the [Xerial JDBC Driver](https://github.com/xerial/sqlite-jdbc). This is used by both the Android and JVM drivers.
+- `androidMain` - Android specific code, which includes an implementation of `DatabaseDriverFactory`.
+- `jvmMain` - JVM specific code which includes an implementation of `DatabaseDriverFactory`.
+- `iosMain` - iOS specific code, which includes am implementation of `DatabaseDriverFactory` class that creates an instance of `app.cash.sqldelight.driver.native.NativeSqliteDriver` and also sets up native SQLite bindings for iOS.
 
 ## Note on SQLDelight
 

core/src/commonMain/kotlin/com/powersync/db/PowerSyncDatabaseImpl.kt

@@ -80,7 +80,7 @@ internal class PowerSyncDatabaseImpl(
     init {
         runBlocking {
             powerSyncVersion =
-                internalDb.get("SELECT powersync_rs_version() as version") { it.getString("version") }
+                internalDb.get("SELECT powersync_rs_version()") { it.getString(0)!! }
             logger.d { "SQLiteVersion: $powerSyncVersion" }
             checkVersion()
             logger.d { "PowerSyncVersion: ${getPowerSyncVersion()}" }
@@ -336,7 +336,10 @@ internal class PowerSyncDatabaseImpl(
 
                 SyncedAt(
                     priority = BucketPriority(it.getLong(0)!!.toInt()),
-                    syncedAt = LocalDateTime.parse(rawTime.replace(" ", "T")).toInstant(TimeZone.UTC),
+                    syncedAt =
+                        LocalDateTime
+                            .parse(rawTime.replace(" ", "T"))
+                            .toInstant(TimeZone.UTC),
                 )
             }
 

demos/android-supabase-todolist/settings.gradle.kts

@@ -17,30 +17,29 @@ dependencyResolutionManagement {
     repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
     repositories {
         google()
-        maven("https://jitpack.io") {
-            content { includeGroup("com.github.requery") }
-        }
         mavenCentral()
     }
 }
 
 rootProject.name = "PowersyncAndroidExample"
 include(":app")
 
-val localProperties = Properties().apply {
-    try {
-        load(file("local.properties").reader())
-    } catch (ignored: java.io.IOException) {
-        // ignore
+val localProperties =
+    Properties().apply {
+        try {
+            load(file("local.properties").reader())
+        } catch (ignored: java.io.IOException) {
+            // ignore
+        }
     }
-}
 val useReleasedVersions = localProperties.getProperty("USE_RELEASED_POWERSYNC_VERSIONS") == "true"
 
 if (!useReleasedVersions) {
     includeBuild("../..") {
         dependencySubstitution {
             substitute(module("com.powersync:core"))
-                .using(project(":core")).because("we want to auto-wire up sample dependency")
+                .using(project(":core"))
+                .because("we want to auto-wire up sample dependency")
             substitute(module("com.powersync:connector-supabase"))
                 .using(project(":connectors:supabase"))
                 .because("we want to auto-wire up sample dependency")

demos/hello-powersync/settings.gradle.kts

@@ -15,9 +15,6 @@ dependencyResolutionManagement {
         google()
         mavenCentral()
         maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
-        maven("https://jitpack.io") {
-            content { includeGroup("com.github.requery") }
-        }
     }
     versionCatalogs {
         create("projectLibs") {
@@ -33,11 +30,13 @@ include(":composeApp")
 includeBuild("../..") {
     dependencySubstitution {
         substitute(module("com.powersync:core"))
-            .using(project(":core")).because("we want to auto-wire up sample dependency")
+            .using(project(":core"))
+            .because("we want to auto-wire up sample dependency")
         substitute(module("com.powersync:connector-supabase"))
             .using(project(":connectors:supabase"))
             .because("we want to auto-wire up sample dependency")
         substitute(module("com.powersync:compose"))
-            .using(project(":compose")).because("we want to auto-wire up sample dependency")
+            .using(project(":compose"))
+            .because("we want to auto-wire up sample dependency")
     }
 }

demos/supabase-todolist/settings.gradle.kts

@@ -11,22 +11,20 @@ pluginManagement {
     }
 }
 
-val localProperties = Properties().apply {
-    try {
-        load(file("local.properties").reader())
-    } catch (ignored: java.io.IOException) {
-        throw Error("local.properties file not found")
+val localProperties =
+    Properties().apply {
+        try {
+            load(file("local.properties").reader())
+        } catch (ignored: java.io.IOException) {
+            throw Error("local.properties file not found")
+        }
     }
-}
 
 dependencyResolutionManagement {
     repositories {
         google()
         mavenCentral()
         maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
-        maven("https://jitpack.io") {
-            content { includeGroup("com.github.requery") }
-        }
     }
 }
 
@@ -46,9 +44,11 @@ if (!useReleasedVersions) {
     includeBuild("../..") {
         dependencySubstitution {
             substitute(module("com.powersync:core"))
-                .using(project(":core")).because("we want to auto-wire up sample dependency")
+                .using(project(":core"))
+                .because("we want to auto-wire up sample dependency")
             substitute(module("com.powersync:persistence"))
-                .using(project(":persistence")).because("we want to auto-wire up sample dependency")
+                .using(project(":persistence"))
+                .because("we want to auto-wire up sample dependency")
             substitute(module("com.powersync:connector-supabase"))
                 .using(project(":connectors:supabase"))
                 .because("we want to auto-wire up sample dependency")

gradle/libs.versions.toml

@@ -86,7 +86,6 @@ sqldelight-driver-native = { module = "app.cash.sqldelight:native-driver", versi
 sqliter = { module = "co.touchlab:sqliter-driver", version.ref = "sqliter" }
 sqldelight-driver-android = { module = "app.cash.sqldelight:android-driver", version.ref = "sqlDelight" }
 sqldelight-driver-jdbc = { module = "app.cash.sqldelight:sqlite-driver", version.ref = "sqlDelight" }
-requery-sqlite-android = { module = "com.github.requery:sqlite-android", version.ref = "sqlite-android" }
 sqldelight-coroutines = { module = "app.cash.sqldelight:coroutines-extensions", version.ref = "sqlDelight" }
 sqldelight-runtime = { module = "app.cash.sqldelight:runtime", version.ref = "sqlDelight" }
 sqldelight-dialect-sqlite338 = { module = "app.cash.sqldelight:sqlite-3-38-dialect", version.ref = "sqlDelight" }

persistence/build.gradle.kts

@@ -41,9 +41,7 @@ kotlin {
         }
 
         androidMain.dependencies {
-            api(libs.sqldelight.driver.android)
             api(libs.powersync.sqlite.core.android)
-            api(libs.requery.sqlite.android)
             implementation(libs.androidx.sqliteFramework)
         }