Get static driver test working

Author: simolus3

core/build.gradle.kts

@@ -1,4 +1,3 @@
-import com.android.build.gradle.internal.tasks.factory.dependsOn
 import com.powersync.plugins.sonatype.setupGithubRepository
 import de.undercouch.gradle.tasks.download.Download
 import org.gradle.internal.os.OperatingSystem
@@ -22,53 +21,6 @@ plugins {
     alias(libs.plugins.kotlin.atomicfu)
 }
 
-val sqliteVersion = "3450200"
-val sqliteReleaseYear = "2024"
-
-val sqliteSrcFolder =
-    project.layout.buildDirectory
-        .dir("native/sqlite")
-        .get()
-
-val downloadSQLiteSources by tasks.registering(Download::class) {
-    val zipFileName = "sqlite-amalgamation-$sqliteVersion.zip"
-    val destination = sqliteSrcFolder.file(zipFileName).asFile
-    src("https://www.sqlite.org/$sqliteReleaseYear/$zipFileName")
-    dest(destination)
-    onlyIfNewer(true)
-    overwrite(false)
-}
-
-val unzipSQLiteSources by tasks.registering(Copy::class) {
-    dependsOn(downloadSQLiteSources)
-
-    from(
-        zipTree(downloadSQLiteSources.get().dest).matching {
-            include("*/sqlite3.*")
-            exclude {
-                it.isDirectory
-            }
-            eachFile {
-                this.path = this.name
-            }
-        },
-    )
-    into(sqliteSrcFolder)
-}
-
-val compileSqliteForTesting by tasks.registering(Exec::class) {
-    dependsOn(unzipSQLiteSources)
-
-    val input = sqliteSrcFolder.file("sqlite3.c")
-    inputs.file(input)
-    inputs.file(sqliteSrcFolder.file("sqlite3.h"))
-
-    val output = sqliteSrcFolder.file("libsqlite3.dylib")
-    outputs.file(output)
-
-    commandLine("clang", "-shared", "-o", output.asFile.path, input.asFile.path)
-}
-
 val binariesFolder = project.layout.buildDirectory.dir("binaries/desktop")
 val downloadPowersyncDesktopBinaries by tasks.registering(Download::class) {
     description = "Download PowerSync core extensions for JVM builds and releases"
@@ -227,6 +179,7 @@ kotlin {
 
         if (konanTarget.family == Family.IOS && konanTarget.name.contains("simulator")) {
             binaries.withType<TestExecutable>().configureEach {
+                /*
                 linkTaskProvider.dependsOn(unzipPowersyncFramework)
                 linkerOpts("-framework", "powersync-sqlite-core")
                 val frameworkRoot =
@@ -236,7 +189,7 @@ kotlin {
                         .asFile.path
 
                 linkerOpts("-F", frameworkRoot)
-                linkerOpts("-rpath", frameworkRoot)
+                linkerOpts("-rpath", frameworkRoot)*/
             }
         }
         /*
@@ -284,7 +237,7 @@ kotlin {
             implementation(libs.kotlinx.datetime)
             implementation(libs.stately.concurrency)
             implementation(libs.configuration.annotations)
-            api(project(":persistence"))
+            api(projects.persistence)
             api(libs.kermit)
         }
 
@@ -352,17 +305,6 @@ android {
                 .get()
                 .toInt()
         consumerProguardFiles("proguard-rules.pro")
-
-        @Suppress("UnstableApiUsage")
-        externalNativeBuild {
-            cmake {
-                arguments.addAll(
-                    listOf(
-                        "-DSQLITE3_SRC_DIR=${sqliteSrcFolder.asFile.absolutePath}",
-                    ),
-                )
-            }
-        }
     }
 
     sourceSets {

gradle/libs.versions.toml

@@ -18,6 +18,7 @@ uuid = "0.8.2"
 powersync-core = "0.3.12"
 sqlite-android = "3.45.0"
 sqlite-jdbc = "3.45.2.0"
+sqliter = "1.3.1"
 turbine = "1.2.0"
 
 sqlDelight = "2.0.2"
@@ -81,7 +82,6 @@ ktor-client-mock = { module = "io.ktor:ktor-client-mock", version.ref = "ktor" }
 ktor-serialization-json = { module = "io.ktor:ktor-serialization-kotlinx-json", version.ref = "ktor" }
 kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }
 
-sqldelight-driver-ios = { module = "app.cash.sqldelight:native-driver", version.ref = "sqlDelight" }
 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" }

persistence/build.gradle.kts

@@ -36,7 +36,6 @@ kotlin {
     explicitApi()
 
     sourceSets {
-
         commonMain.dependencies {
             api(libs.bundles.sqldelight)
         }
@@ -53,7 +52,7 @@ kotlin {
         }
 
         iosMain.dependencies {
-            api(libs.sqldelight.driver.ios)
+            api(projects.staticSqliteDriver)
         }
     }
 }

settings.gradle.kts

@@ -23,6 +23,7 @@ rootProject.name = "powersync-root"
 include(":core")
 include(":core-tests-android")
 include(":connectors:supabase")
+include("static-sqlite-driver")
 
 include(":dialect")
 include(":persistence")

static-sqlite-driver/README.md

@@ -0,0 +1,4 @@
+This builds [SQLiter](https://github.com/touchlab/SQLiter) and the [SQlDelight native driver](https://github.com/sqldelight/sqldelight/tree/master/drivers/native-driver)
+as an independent project.
+
+We use unchanged source code, but change the buil logic to link SQLite statically.

static-sqlite-driver/src/nativeTest/kotlin/SmokeTest.kt

@@ -0,0 +1,22 @@
+import co.touchlab.sqliter.DatabaseConfiguration
+import co.touchlab.sqliter.createDatabaseManager
+import kotlin.test.Test
+import kotlin.test.assertEquals
+
+class SmokeTest {
+    @Test
+    fun canUseSqlite() {
+        val manager = createDatabaseManager(DatabaseConfiguration(
+            name = "test",
+            version = 1,
+            create = {},
+            inMemory = true,
+        ))
+        val db = manager.createSingleThreadedConnection()
+        val stmt = db.createStatement("SELECT sqlite_version();")
+        val cursor = stmt.query()
+
+        assertEquals(true, cursor.next())
+        db.close()
+    }
+}