Merge pull request #334 from joreilly/dep_updates

dependency updates + SwiftUI updates

Author: joreilly

README.md

@@ -1,6 +1,6 @@
 # BikeShare
 
-![kotlin-version](https://img.shields.io/badge/kotlin-2.2.10-blue?logo=kotlin)
+![kotlin-version](https://img.shields.io/badge/kotlin-2.2.21-blue?logo=kotlin)
 
 Compose Multiplatform and SwiftUI based Kotlin Multiplatform sample project (based on [CityBikes API](http://api.citybik.es/v2/)).  Uses [Circuit](https://github.com/slackhq/circuit) and [kotlin-inject](https://github.com/evant/kotlin-inject).
 

compose-web/src/wasmJsMain/kotlin/Main.kt

@@ -20,28 +20,29 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.CanvasBasedWindow
+import androidx.compose.ui.window.ComposeViewport
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
 
 @OptIn(ExperimentalComposeUiApi::class)
 fun main() {
-    CanvasBasedWindow("BikeShare", canvasElementId = "bikeShareCanvas") {
-        Column {
-            Text(
-                text ="Bike Share (powered by CityBikes)",
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .background(color = Color.Gray)
-                    .align(Alignment.CenterHorizontally)
-                    .padding(8.dp),
-                textAlign = TextAlign.Center,
-                color = Color.White,
-                style = MaterialTheme.typography.headlineSmall)
-
-            BikeShareView()
-        }
-    }
+    ComposeViewport(content = {
+            Column {
+                Text(
+                    text ="Bike Share (powered by CityBikes)",
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .background(color = Color.Gray)
+                        .align(Alignment.CenterHorizontally)
+                        .padding(8.dp),
+                    textAlign = TextAlign.Center,
+                    color = Color.White,
+                    style = MaterialTheme.typography.headlineSmall)
+
+                BikeShareView()
+            }
+        })
 }
 
 const val POLL_INTERVAL = 30000L

gradle/libs.versions.toml

@@ -1,30 +1,30 @@
 [versions]
-kotlin = "2.2.20"
-ksp = "2.2.20-2.0.2"
+kotlin = "2.2.21"
+ksp = "2.3.0"
 
-androidGradlePlugin = "8.12.3"
+androidGradlePlugin = "8.13.1"
 androidxActivity = "1.11.0"
-androidxComposeBom = "2025.09.00"
-androidxLifecycle = "2.9.3"
-androidxNavigationCompose = "2.9.4"
-androidxRoom = "2.8.0"
-circuit = "0.30.0"
-composeLifecyleRuntime="2.9.3"
-compose-multiplatform = "1.8.2"
-composeAdaptiveLayout = "1.1.2"
+androidxComposeBom = "2025.11.00"
+androidxLifecycle = "2.9.4"
+androidxNavigationCompose = "2.9.6"
+androidxRoom = "2.8.3"
+circuit = "0.31.0"
+composeLifecyleRuntime="2.9.6"
+compose-multiplatform = "1.9.3"
+composeAdaptiveLayout = "1.2.0"
 coroutines = "1.10.2"
 junit = "4.13.2"
-kmpNativeCoroutines = "1.0.0-ALPHA-47"
-kmpObservableViewModel = "1.0.0-BETA-14"
+kmpNativeCoroutines = "1.0.0-ALPHA-48"
+kmpObservableViewModel = "1.0.0-BETA-15"
 kotlin-inject-anvil = "0.1.6"
 kotlininject = "0.8.0"
 kotlinxSerialization = "1.9.0"
-ktor = "3.2.3"
-okhttp = "5.1.0"
+ktor = "3.3.2"
+okhttp = "5.3.0"
 runner = "1.7.0"
 slf4j = "2.0.17"
 slf4jAndroid = "2.0.17-0"
-sqlite = "2.6.0"
+sqlite = "2.6.1"
 
 minSdk = "24"
 targetSdk = "36"