Bring back desktop support

simolus3 · simolus3 · commit df2b75e1a5a9 · 2025-08-05T14:14:31.000+02:00
diff --git a/compose/build.gradle.kts b/compose/build.gradle.kts
@@ -12,7 +12,12 @@ plugins {
 }
 
 kotlin {
-    powersyncTargets(includeTargetsWithoutComposeSupport = false)
+    powersyncTargets(
+        includeTargetsWithoutComposeSupport = false,
+        // Recent versions of Compose Multiplatform generate bytecode with Java 11, which we have
+        // to adopt as well
+        legacyJavaSupport = false,
+    )
 
     explicitApi()
 
diff --git a/demos/android-supabase-todolist/build.gradle.kts b/demos/android-supabase-todolist/build.gradle.kts
@@ -86,16 +86,21 @@ kotlin {
 }
 
 val useReleasedVersions = getLocalProperty("USE_RELEASED_POWERSYNC_VERSIONS", "false") == "true"
-if (!useReleasedVersions) {
+if (useReleasedVersions) {
     configurations.all {
         // https://docs.gradle.org/current/userguide/resolution_rules.html#sec:conditional-dependency-substitution
         resolutionStrategy.dependencySubstitution.all {
             requested.let {
-                if (it is ModuleComponentSelector && it.group == "com.powersync") {
-                    val targetProject = findProject(":${it.module}")
-                    if (targetProject != null) {
-                        useTarget(targetProject)
+                if (it is ProjectComponentSelector) {
+                    val projectPath = it.projectPath
+                    // Translate a dependency of e.g. :core into com.powersync:core:latest.release,
+                    // taking into account that the Supabase connector uses a custom name.
+                    val moduleName = when (projectPath) {
+                        ":connectors:supabase" -> "connector-supabase"
+                        else -> it.projectPath.substring(1).replace(':', '-')
                     }
+
+                    useTarget("com.powersync:${moduleName}:latest.release")
                 }
             }
         }
@@ -120,11 +125,11 @@ dependencies {
     androidTestImplementation(libs.androidx.ui.test.junit4)
     debugImplementation(libs.androidx.ui.tooling)
     debugImplementation(libs.androidx.ui.test.manifest)
-    // To use a fixed version, replace "latest.release" with the latest version available at
+    // When adopting the PowerSync dependencies into your project, use the latest version available at
     // https://central.sonatype.com/artifact/com.powersync/core
-    implementation("com.powersync:core:latest.release")
-    implementation("com.powersync:connector-supabase:latest.release")
-    implementation("com.powersync:compose:latest.release")
+    implementation(projects.core) // "com.powersync:core:latest.release"
+    implementation(projects.connectors.supabase) // "com.powersync:connector-supabase:latest.release"
+    implementation(projects.compose) // "com.powersync:compose:latest.release"
     implementation(libs.uuid)
     implementation(libs.kermit)
     implementation(libs.androidx.material.icons.extended)
diff --git a/demos/supabase-todolist/README.md b/demos/supabase-todolist/README.md
@@ -41,8 +41,7 @@ all items have been received.
 1. Clone this repo: ```git clone https://github.com/powersync-ja/powersync-kotlin.git```
 2. Open the repo in Android Studio. This creates a `local.properties` file in root and should contain a `sdk.dir=/path/to/android/sdk` line.
 3. Sync the project with Gradle (this should happen automatically, or choose File > Sync project with Gradle Files).
-4. Open the `demos/supabase-todolist` directory in Android Studio and sync this project with Gradle.
-5. Insert your Supabase project URL, Supabase Anon Key, and PowerSync instance URL into the `local.properties` file:
+4. Insert your Supabase project URL, Supabase Anon Key, and PowerSync instance URL into the `demos/supabase-todlist/local.properties` file:
 
 ```bash
 # local.properties
diff --git a/demos/supabase-todolist/androidBackgroundSync/build.gradle.kts b/demos/supabase-todolist/androidBackgroundSync/build.gradle.kts
@@ -42,9 +42,9 @@ android {
 }
 
 dependencies {
-    // When copying this example, replace "latest.release" with the current version available
+    // When copying this example, use the the current version available
     // at: https://central.sonatype.com/artifact/com.powersync/connector-supabase
-    implementation("com.powersync:connector-supabase:latest.release")
+    implementation(projects.connectors.supabase) // "com.powersync:connector-supabase"
 
     implementation(projects.demos.supabaseTodolist.shared)
 
diff --git a/demos/supabase-todolist/build.gradle.kts b/demos/supabase-todolist/build.gradle.kts
@@ -13,19 +13,30 @@ if (localPropertiesFile.exists()) {
 val useReleasedVersions = localProperties.getProperty("USE_RELEASED_POWERSYNC_VERSIONS", "false") == "true"
 
 subprojects {
-    if (!useReleasedVersions) {
+    if (useReleasedVersions) {
         configurations.all {
             // https://docs.gradle.org/current/userguide/resolution_rules.html#sec:conditional-dependency-substitution
             resolutionStrategy.dependencySubstitution.all {
                 requested.let {
-                    if (it is ModuleComponentSelector && it.group == "com.powersync") {
-                        val targetProject = findProject(":${it.module}")
-                        if (targetProject != null) {
-                            useTarget(targetProject)
+                    if (it is ProjectComponentSelector) {
+                        val projectPath = it.projectPath
+                        if (projectPath.contains("demos")) {
+                            // Project dependency within the demo, don't replace
+                            return@let
                         }
+
+                        // Translate a dependency of e.g. :core into com.powersync:core:latest.release,
+                        // taking into account that the Supabase connector uses a custom name.
+                        val moduleName = when (projectPath) {
+                            ":connectors:supabase" -> "connector-supabase"
+                            else -> it.projectPath.substring(1).replace(':', '-')
+                        }
+
+                        useTarget("com.powersync:${moduleName}:latest.release")
                     }
                 }
             }
         }
     }
 }
+
diff --git a/demos/supabase-todolist/desktopApp/build.gradle.kts b/demos/supabase-todolist/desktopApp/build.gradle.kts
@@ -11,7 +11,7 @@ kotlin {
     sourceSets {
         jvmMain.dependencies {
             implementation(compose.desktop.currentOs)
-            //implementation(projects.shared)
+            implementation(projects.demos.supabaseTodolist.shared)
         }
     }
 }
diff --git a/demos/supabase-todolist/shared/build.gradle.kts b/demos/supabase-todolist/shared/build.gradle.kts
@@ -39,11 +39,11 @@ kotlin {
     }
     sourceSets {
         commonMain.dependencies {
-            // When copying this example, replace "latest.release" with the current version available
+            // When copying this example, use the current version available
             // at: https://central.sonatype.com/artifact/com.powersync/core
-            api("com.powersync:core:latest.release")
-            implementation("com.powersync:connector-supabase:latest.release")
-            implementation("com.powersync:compose:latest.release")
+            api(projects.core) // "com.powersync:core"
+            implementation(projects.connectors.supabase) // "com.powersync:connector-supabase"
+            implementation(projects.compose) // "com.powersync:compose"
             implementation(libs.uuid)
             implementation(compose.runtime)
             implementation(compose.foundation)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -28,10 +28,10 @@ stately = "2.1.0"
 supabase = "3.2.2"
 junit = "4.13.2"
 
-compose = "1.6.11" # This is for the multiplatform compose
+compose = "1.8.2" # This is for the multiplatform compose
 androidCompose = "2025.07.00"
 compose-preview = "1.8.3"
-compose-lifecycle = "2.8.4"
+compose-lifecycle = "2.9.1"
 androidxSqlite = "2.5.2"
 androidxSplashscreen = "1.0.1"
 
diff --git a/plugins/sonatype/src/main/kotlin/com/powersync/plugins/utils/KmpUtils.kt b/plugins/sonatype/src/main/kotlin/com/powersync/plugins/utils/KmpUtils.kt
@@ -9,6 +9,7 @@ public fun KotlinTargetContainerWithPresetFunctions.powersyncTargets(
     jvm: Boolean = true,
     includeTargetsWithoutComposeSupport: Boolean = true,
     watchOS: Boolean = true,
+    legacyJavaSupport: Boolean = true,
 ) {
     if (jvm) {
         androidTarget {
@@ -23,9 +24,14 @@ public fun KotlinTargetContainerWithPresetFunctions.powersyncTargets(
         jvm {
             @OptIn(ExperimentalKotlinGradlePluginApi::class)
             compilerOptions {
-                jvmTarget.set(JvmTarget.JVM_1_8)
-                // https://jakewharton.com/kotlins-jdk-release-compatibility-flag/
-                freeCompilerArgs.add("-Xjdk-release=8")
+                if (legacyJavaSupport) {
+                    jvmTarget.set(JvmTarget.JVM_1_8)
+                    // https://jakewharton.com/kotlins-jdk-release-compatibility-flag/
+                    freeCompilerArgs.add("-Xjdk-release=8")
+                } else {
+                    jvmTarget.set(JvmTarget.JVM_11)
+                    freeCompilerArgs.add("-Xjdk-release=11")
+                }
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -42,9 +42,9 @@ android {`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`dependencies {`
`45`		`- // When copying this example, replace "latest.release" with the current version available`
	`45`	`+ // When copying this example, use the the current version available`
`46`	`46`	`// at: https://central.sonatype.com/artifact/com.powersync/connector-supabase`
`47`		`- implementation("com.powersync:connector-supabase:latest.release")`
	`47`	`+ implementation(projects.connectors.supabase) // "com.powersync:connector-supabase"`
`48`	`48`
`49`	`49`	`implementation(projects.demos.supabaseTodolist.shared)`
`50`	`50`
Original file line number	Diff line number	Diff line change
`@@ -13,19 +13,30 @@ if (localPropertiesFile.exists()) {`
`13`	`13`	`val useReleasedVersions = localProperties.getProperty("USE_RELEASED_POWERSYNC_VERSIONS", "false") == "true"`
`14`	`14`
`15`	`15`	`subprojects {`
`16`		`- if (!useReleasedVersions) {`
	`16`	`+ if (useReleasedVersions) {`
`17`	`17`	`configurations.all {`
`18`	`18`	`// https://docs.gradle.org/current/userguide/resolution_rules.html#sec:conditional-dependency-substitution`
`19`	`19`	`resolutionStrategy.dependencySubstitution.all {`
`20`	`20`	`requested.let {`
`21`		`- if (it is ModuleComponentSelector && it.group == "com.powersync") {`
`22`		`- val targetProject = findProject(":${it.module}")`
`23`		`- if (targetProject != null) {`
`24`		`- useTarget(targetProject)`
	`21`	`+ if (it is ProjectComponentSelector) {`
	`22`	`+ val projectPath = it.projectPath`
	`23`	`+ if (projectPath.contains("demos")) {`
	`24`	`+ // Project dependency within the demo, don't replace`
	`25`	`+ return@let`
`25`	`26`	`}`
	`27`	`+`
	`28`	`+ // Translate a dependency of e.g. :core into com.powersync:core:latest.release,`
	`29`	`+ // taking into account that the Supabase connector uses a custom name.`
	`30`	`+ val moduleName = when (projectPath) {`
	`31`	`+ ":connectors:supabase" -> "connector-supabase"`
	`32`	`+ else -> it.projectPath.substring(1).replace(':', '-')`
	`33`	`+ }`
	`34`	`+`
	`35`	`+ useTarget("com.powersync:${moduleName}:latest.release")`
`26`	`36`	`}`
`27`	`37`	`}`
`28`	`38`	`}`
`29`	`39`	`}`
`30`	`40`	`}`
`31`	`41`	`}`
	`42`	`+`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ kotlin {`
`11`	`11`	`sourceSets {`
`12`	`12`	`jvmMain.dependencies {`
`13`	`13`	`implementation(compose.desktop.currentOs)`
`14`		`- //implementation(projects.shared)`
	`14`	`+ implementation(projects.demos.supabaseTodolist.shared)`
`15`	`15`	`}`
`16`	`16`	`}`
`17`	`17`	`}`