powersync-ja · simolus3 · Feb 20, 2025 · Feb 20, 2025 · Feb 20, 2025
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -51,6 +51,9 @@ allprojects {
         exclude(group = "ai.grazie.model")
         exclude(group = "ai.grazie.utils")
         exclude(group = "ai.grazie.nlp")
+
+        // We have a transitive dependency on this due to Kermit, but need the fixed version to support Java 8
+        resolutionStrategy.force("co.touchlab:stately-collections:${libs.versions.stately.get()}")
     }
 
     //

diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -2,7 +2,10 @@ import app.cash.sqldelight.core.capitalize
 import com.powersync.plugins.sonatype.setupGithubRepository
 import de.undercouch.gradle.tasks.download.Download
 import org.gradle.internal.os.OperatingSystem
+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
+import org.jetbrains.kotlin.gradle.targets.jvm.tasks.KotlinJvmTest
 import java.util.*
 
 plugins {
@@ -76,8 +79,20 @@ val buildCInteropDef by tasks.registering {
 kotlin {
     androidTarget {
         publishLibraryVariants("release", "debug")
+
+        @OptIn(ExperimentalKotlinGradlePluginApi::class)
+        compilerOptions {
+            jvmTarget.set(JvmTarget.JVM_17)
+        }
+    }
+    jvm {
+        @OptIn(ExperimentalKotlinGradlePluginApi::class)
+        compilerOptions {
+            jvmTarget.set(JvmTarget.JVM_1_8)
+            // https://jakewharton.com/kotlins-jdk-release-compatibility-flag/
+            freeCompilerArgs.add("-Xjdk-release=8")
+        }
     }
-    jvm()
 
     iosX64()
     iosArm64()
@@ -147,8 +162,8 @@ kotlin {
 }
 
 android {
-    kotlin {
-        jvmToolchain(17)
+    compileOptions {
+        targetCompatibility = JavaVersion.VERSION_17
     }
 
     buildFeatures {
@@ -339,6 +354,22 @@ tasks.named<ProcessResources>(kotlin.jvm().compilations["main"].processResources
     from(getBinaries, downloadPowersyncDesktopBinaries)
 }
 
+// We want to build with recent JDKs, but need to make sure we support Java 8. https://jakewharton.com/build-on-latest-java-test-through-lowest-java/
+val testWithJava8 by tasks.registering(KotlinJvmTest::class) {
+    javaLauncher = javaToolchains.launcherFor {
+        languageVersion = JavaLanguageVersion.of(8)
+    }
+
+    description = "Run tests with Java 8"
+    group = LifecycleBasePlugin.VERIFICATION_GROUP
+
+    // Copy inputs from the normal test task
+    val testTask = tasks.getByName("jvmTest") as KotlinJvmTest
+    classpath = testTask.classpath
+    testClassesDirs = testTask.testClassesDirs
+}
+tasks.named("check").configure { dependsOn(testWithJava8) }
+
 afterEvaluate {
     val buildTasks =
         tasks.matching {

diff --git a/core/src/androidMain/kotlin/com/powersync/DatabaseDriverFactory.android.kt b/core/src/androidMain/kotlin/com/powersync/DatabaseDriverFactory.android.kt
@@ -42,38 +42,38 @@ public actual class DatabaseDriverFactory(
             PsSqlDriver(
                 scope = scope,
                 driver =
-                AndroidSqliteDriver(
-                    context = context,
-                    schema = schema,
-                    name = dbFilename,
-                    factory =
-                    RequerySQLiteOpenHelperFactory(
-                        listOf(
-                            RequerySQLiteOpenHelperFactory.ConfigurationOptions { config ->
-                                config.customExtensions.add(
-                                    SQLiteCustomExtension(
-                                        "libpowersync",
-                                        "sqlite3_powersync_init",
-                                    ),
-                                )
-                                config.customExtensions.add(
-                                    SQLiteCustomExtension(
-                                        "libpowersync-sqlite",
-                                        "powersync_init",
-                                    ),
-                                )
-                                config
+                    AndroidSqliteDriver(
+                        context = context,
+                        schema = schema,
+                        name = dbFilename,
+                        factory =
+                            RequerySQLiteOpenHelperFactory(
+                                listOf(
+                                    RequerySQLiteOpenHelperFactory.ConfigurationOptions { config ->
+                                        config.customExtensions.add(
+                                            SQLiteCustomExtension(
+                                                "libpowersync",
+                                                "sqlite3_powersync_init",
+                                            ),
+                                        )
+                                        config.customExtensions.add(
+                                            SQLiteCustomExtension(
+                                                "libpowersync-sqlite",
+                                                "powersync_init",
+                                            ),
+                                        )
+                                        config
+                                    },
+                                ),
+                            ),
+                        callback =
+                            object : AndroidSqliteDriver.Callback(schema) {
+                                override fun onConfigure(db: SupportSQLiteDatabase) {
+                                    db.enableWriteAheadLogging()
+                                    super.onConfigure(db)
+                                }
                             },
-                        ),
                     ),
-                    callback =
-                    object : AndroidSqliteDriver.Callback(schema) {
-                        override fun onConfigure(db: SupportSQLiteDatabase) {
-                            db.enableWriteAheadLogging()
-                            super.onConfigure(db)
-                        }
-                    },
-                ),
             )
         setupSqliteBinding()
         return this.driver as PsSqlDriver

diff --git a/...onMain/kotlin/com/powersync/Exceptions.kt → ...otlin/com/powersync/PowerSyncException.kt b/...onMain/kotlin/com/powersync/Exceptions.kt → ...otlin/com/powersync/PowerSyncException.kt
diff --git a/core/src/commonMain/kotlin/com/powersync/sync/SyncStatus.kt b/core/src/commonMain/kotlin/com/powersync/sync/SyncStatus.kt
@@ -81,6 +81,7 @@ internal data class SyncStatusDataContainer(
         get() = downloadError ?: uploadError
 }
 
+@ConsistentCopyVisibility
 public data class SyncStatus internal constructor(
     private var data: SyncStatusDataContainer = SyncStatusDataContainer(),
 ) : SyncStatusData {

diff --git a/core/src/iosMain/kotlin/com/powersync/DatabaseDriverFactory.ios.kt b/core/src/iosMain/kotlin/com/powersync/DatabaseDriverFactory.ios.kt
@@ -75,27 +75,27 @@ public actual class DatabaseDriverFactory {
             PsSqlDriver(
                 scope = scope,
                 driver =
-                NativeSqliteDriver(
-                    configuration =
-                    DatabaseConfiguration(
-                        name = dbFilename,
-                        version = schema.version.toInt(),
-                        create = { connection -> wrapConnection(connection) { schema.create(it) } },
-                        loggingConfig = Logging(logger = sqlLogger),
-                        lifecycleConfig =
-                        DatabaseConfiguration.Lifecycle(
-                            onCreateConnection = { connection ->
-                                setupSqliteBinding(connection)
-                                wrapConnection(connection) { driver ->
-                                    schema.create(driver)
-                                }
-                            },
-                            onCloseConnection = { connection ->
-                                deregisterSqliteBinding(connection)
-                            },
-                        ),
+                    NativeSqliteDriver(
+                        configuration =
+                            DatabaseConfiguration(
+                                name = dbFilename,
+                                version = schema.version.toInt(),
+                                create = { connection -> wrapConnection(connection) { schema.create(it) } },
+                                loggingConfig = Logging(logger = sqlLogger),
+                                lifecycleConfig =
+                                    DatabaseConfiguration.Lifecycle(
+                                        onCreateConnection = { connection ->
+                                            setupSqliteBinding(connection)
+                                            wrapConnection(connection) { driver ->
+                                                schema.create(driver)
+                                            }
+                                        },
+                                        onCloseConnection = { connection ->
+                                            deregisterSqliteBinding(connection)
+                                        },
+                                    ),
+                            ),
                     ),
-                ),
             )
         return this.driver as PsSqlDriver
     }

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -8,7 +8,7 @@ java = "17"
 idea = "222.4459.24" # Flamingo | 2022.2.1 (see https://plugins.jetbrains.com/docs/intellij/android-studio-releases-list.html)
 
 # Dependencies
-kermit = "2.0.4"
+kermit = "2.0.5"
 kotlin = "2.0.20"
 coroutines = "1.8.1"
 kotlinx-datetime = "0.5.0"
@@ -20,7 +20,7 @@ sqlite-android = "3.45.0"
 sqlite-jdbc = "3.45.2.0"
 
 sqlDelight = "2.0.2"
-stately = "2.0.7"
+stately = "2.1.0"
 supabase = "3.0.1"
 junit = "4.13.2"
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/persistence/build.gradle.kts b/persistence/build.gradle.kts
@@ -1,4 +1,6 @@
 import com.powersync.plugins.sonatype.setupGithubRepository
+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.kotlinMultiplatform)
@@ -11,9 +13,21 @@ plugins {
 kotlin {
     androidTarget {
         publishLibraryVariants("release", "debug")
+
+        @OptIn(ExperimentalKotlinGradlePluginApi::class)
+        compilerOptions {
+            jvmTarget.set(JvmTarget.JVM_17)
+        }
     }
 
-    jvm()
+    jvm {
+        @OptIn(ExperimentalKotlinGradlePluginApi::class)
+        compilerOptions {
+            jvmTarget.set(JvmTarget.JVM_1_8)
+            // https://jakewharton.com/kotlins-jdk-release-compatibility-flag/
+            freeCompilerArgs.add("-Xjdk-release=8")
+        }
+    }
 
     iosX64()
     iosArm64()
@@ -45,8 +59,8 @@ kotlin {
 }
 
 android {
-    kotlin {
-        jvmToolchain(17)
+    compileOptions {
+        targetCompatibility = JavaVersion.VERSION_17
     }
 
     buildFeatures {