Add JVM support in shared desktop app

Author: simolus3

demos/supabase-todolist/README.md

@@ -3,7 +3,7 @@
 It is a simple to-do list application demonstrating use of the PowerSync Kotlin Mutiplatform SDK together
 with [Supabase](https://supabase.com/) in a basic Kotlin Multiplatform Compose App.
 
-Supported KMP targets: Android and iOS.
+Supported KMP targets: Android, iOS and Desktop (JVM).
 
 ## Setting up your development environment
 

demos/supabase-todolist/desktopApp/build.gradle.kts

@@ -11,7 +11,7 @@ kotlin {
     sourceSets {
         jvmMain.dependencies {
             implementation(compose.desktop.currentOs)
-            implementation(project(":shared"))
+            implementation(projects.shared)
         }
     }
 }

demos/supabase-todolist/gradle/libs.versions.toml

@@ -18,6 +18,7 @@ junit = "4.13.2"
 
 compose = "1.6.11"
 compose-preview = "1.7.2"
+lifecycle = "2.8.2"
 
 # plugins
 android-gradle-plugin = "8.5.1"
@@ -49,13 +50,15 @@ ktor-client-okhttp = { module = "io.ktor:ktor-client-okhttp", version.ref = "kto
 ktor-client-contentnegotiation = { module = "io.ktor:ktor-client-content-negotiation", 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" }
+kotlinx-coroutines-swing = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-swing", version.ref = "coroutines" }
 
 androidx-core = { group = "androidx.core", name = "core-ktx", version.ref = "androidx-core" }
 androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "androidx-appcompat" }
 androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity-compose" }
 androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "androidx-espresso-core" }
 androidx-material = { group = "com.google.android.material", name = "material", version.ref = "androidx-material" }
 compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "compose-preview" }
+compose-lifecycle = { module = "org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "lifecycle" }
 
 [plugins]
 androidApplication = { id = "com.android.application", version.ref = "android-gradle-plugin" }

demos/supabase-todolist/iosApp/iosApp.xcodeproj/project.pbxproj

@@ -118,7 +118,6 @@
 				7555FF79242A565900829871 /* Resources */,
 				F85CB1118929364A9C6EFABC /* Frameworks */,
 				3C5ACF3A4AAFF294B2A5839B /* [CP] Embed Pods Frameworks */,
-				79E17356D7D971831C2A4119 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -231,23 +230,6 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		79E17356D7D971831C2A4119 /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-iosApp/Pods-iosApp-resources-${CONFIGURATION}-input-files.xcfilelist",
-			);
-			name = "[CP] Copy Pods Resources";
-			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-iosApp/Pods-iosApp-resources-${CONFIGURATION}-output-files.xcfilelist",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-iosApp/Pods-iosApp-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */

demos/supabase-todolist/settings.gradle.kts

@@ -43,7 +43,7 @@ rootProject.name = "supabase-todolist"
 
 include(":androidApp")
 include(":shared")
-//include(":desktopApp")
+include(":desktopApp")
 
 includeBuild("../..") {
     dependencySubstitution {

demos/supabase-todolist/shared/build.gradle.kts

@@ -15,7 +15,7 @@ version = "1.0-SNAPSHOT"
 kotlin {
     androidTarget()
 
-//    jvm()
+    jvm()
     iosX64()
     iosArm64()
     iosSimulatorArm64()
@@ -48,16 +48,18 @@ kotlin {
             implementation(compose.material)
             implementation(compose.components.resources)
             implementation(compose.materialIconsExtended)
+            implementation(libs.compose.lifecycle)
         }
         androidMain.dependencies {
             api(libs.androidx.activity.compose)
             api(libs.androidx.appcompat)
             api(libs.androidx.core)
         }
 
-//        jvmMain.dependencies {
-//            implementation(compose.desktop.common)
-//        }
+        jvmMain.dependencies {
+            implementation(compose.desktop.common)
+            implementation(libs.kotlinx.coroutines.swing)
+        }
     }
 }
 

demos/supabase-todolist/shared/src/commonMain/kotlin/com/powersync/demos/App.kt

@@ -13,6 +13,7 @@ import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.ui.Modifier
 import com.powersync.DatabaseDriverFactory
 import com.powersync.PowerSyncDatabase
+import com.powersync.bucket.BucketPriority
 import com.powersync.connector.supabase.SupabaseConnector
 import com.powersync.demos.components.EditDialog
 import com.powersync.demos.powersync.ListContent
@@ -36,9 +37,15 @@ fun App(factory: DatabaseDriverFactory, modifier: Modifier = Modifier) {
         )
     }
     val db = remember { PowerSyncDatabase(factory, schema) }
-    val status = db.currentStatus.asFlow().collectAsState(initial = null)
-    val hasSynced by remember { derivedStateOf { status.value?.hasSynced } }
-
+    val status by db.currentStatus.asFlow().collectAsState(initial = db.currentStatus)
+
+    // This assumes that the buckets for lists has a priority of 1 (but it will work fine with sync
+    // rules not defining any priorities at all too). When giving lists a higher priority than
+    // items, we can have a consistent snapshot of lists without items. In the case where many items
+    // exist (that might take longer to sync initially), this allows us to display lists earlier.
+    val hasSyncedLists by remember {
+        derivedStateOf { status.statusForPriority(BucketPriority(1)).hasSynced }
+    }
 
     val navController = remember { NavController(Screen.Home) }
     val authViewModel = remember {
@@ -86,14 +93,14 @@ fun App(factory: DatabaseDriverFactory, modifier: Modifier = Modifier) {
             HomeScreen(
                 modifier = modifier.background(MaterialTheme.colors.background),
                 items = items,
-                isConnected = status.value?.connected,
+                isConnected = status.connected,
                 onSignOutSelected = { handleSignOut() },
                 inputText = listsInputText,
                 onItemClicked = handleOnItemClicked,
                 onItemDeleteClicked = lists.value::onItemDeleteClicked,
                 onAddItemClicked = lists.value::onAddItemClicked,
                 onInputTextChanged = lists.value::onInputTextChanged,
-                hasSynced = hasSynced
+                hasSynced = hasSyncedLists
             )
         }
 
@@ -106,7 +113,7 @@ fun App(factory: DatabaseDriverFactory, modifier: Modifier = Modifier) {
                 modifier = modifier.background(MaterialTheme.colors.background),
                 navController = navController,
                 items = todoItems,
-                isConnected = status.value?.connected,
+                isConnected = status.connected,
                 inputText = todosInputText,
                 onItemClicked = todos.value::onItemClicked,
                 onItemDoneChanged = todos.value::onItemDoneChanged,

demos/supabase-todolist/shared/src/commonMain/kotlin/com/powersync/demos/screens/HomeScreen.kt

@@ -28,7 +28,7 @@ internal fun HomeScreen(
     modifier: Modifier = Modifier,
     items: List<ListItem>,
     inputText: String,
-    isConnected: Boolean?,
+    isConnected: Boolean,
     hasSynced: Boolean?,
     onSignOutSelected: () -> Unit,
     onItemClicked: (item: ListItem) -> Unit,
@@ -49,7 +49,7 @@ internal fun HomeScreen(
                 onSignOutSelected
             ) },
             actions = {
-                WifiIcon(isConnected ?: false)
+                WifiIcon(isConnected)
                 Spacer(modifier = Modifier.width(16.dp))
             }
         )

demos/supabase-todolist/shared/src/commonMain/kotlin/com/powersync/demos/screens/TodosScreen.kt

@@ -32,7 +32,7 @@ internal fun TodosScreen(
     navController: NavController,
     items: List<TodoItem>,
     inputText: String,
-    isConnected: Boolean?,
+    isConnected: Boolean,
     onItemClicked: (item: TodoItem) -> Unit,
     onItemDoneChanged: (item: TodoItem, isDone: Boolean) -> Unit,
     onItemDeleteClicked: (item: TodoItem) -> Unit,
@@ -53,7 +53,7 @@ internal fun TodosScreen(
                 }
             },
             actions = {
-                WifiIcon(isConnected ?: false)
+                WifiIcon(isConnected)
                 Spacer(modifier = Modifier.width(16.dp))
             }
         )