Merge pull request #416 from joreilly/dep_updates

dependency updates

Author: joreilly

README.md

@@ -1,6 +1,6 @@
 # PeopleInSpace
 
-![kotlin-version](https://img.shields.io/badge/kotlin-2.1.21-blue?logo=kotlin)
+![kotlin-version](https://img.shields.io/badge/kotlin-2.2.0-blue?logo=kotlin)
 
 
 **Kotlin Multiplatform** project with SwiftUI, Jetpack Compose, Compose for Wear OS, Compose for Desktop and Compose for Web clients along with Ktor backend. Currently running on

app/src/main/java/com/surrus/peopleinspace/ui/PeopleInSpaceApp.kt

@@ -18,6 +18,7 @@ import androidx.compose.material3.adaptive.navigationsuite.NavigationSuiteScaffo
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.graphics.vector.ImageVector
@@ -27,6 +28,7 @@ import com.surrus.peopleinspace.R
 import com.surrus.peopleinspace.issposition.ISSPositionRoute
 import com.surrus.peopleinspace.persondetails.PersonDetailsScreen
 import com.surrus.peopleinspace.personlist.PersonListRoute
+import kotlinx.coroutines.launch
 
 enum class AppDestinations(
     @StringRes val label: Int,
@@ -42,9 +44,12 @@ enum class AppDestinations(
 fun PeopleInSpaceApp() {
     var currentDestination by rememberSaveable { mutableStateOf(AppDestinations.PERSON_LIST) }
     val navigator = rememberListDetailPaneScaffoldNavigator<Assignment>()
+    val scope = rememberCoroutineScope()
 
     BackHandler(navigator.canNavigateBack()) {
-        navigator.navigateBack()
+        scope.launch {
+            navigator.navigateBack()
+        }
     }
 
     PeopleInSpaceTheme {
@@ -72,15 +77,19 @@ fun PeopleInSpaceApp() {
                         value = navigator.scaffoldValue,
                         listPane = {
                             PersonListRoute { person ->
-                                navigator.navigateTo(ListDetailPaneScaffoldRole.Detail, person)
+                                scope.launch {
+                                    navigator.navigateTo(ListDetailPaneScaffoldRole.Detail, person)
+                                }
                             }
                         },
                         detailPane = {
-                            navigator.currentDestination?.content?.let {
+                            navigator.currentDestination?.contentKey?.let {
                                 PersonDetailsScreen(
                                     person = it,
                                     showBackButton = !navigator.isListPaneVisible(),
-                                    navigator::navigateBack
+                                    popBack = { // It's good practice to name lambda parameters
+                                        scope.launch { navigator.navigateBack() }
+                                    }
                                 )
                             }
                         }

common/build.gradle.kts

@@ -42,7 +42,6 @@ kotlin {
     jvm()
 
     wasmJs {
-        moduleName = "peopleinspaceShared"
         browser {
             commonWebpackConfig {
                 outputFileName = "peopleinspaceShared.js"

compose-web/build.gradle.kts

@@ -16,7 +16,6 @@ version = "1.0-SNAPSHOT"
 @OptIn(org.jetbrains.compose.ExperimentalComposeLibrary::class)
 kotlin {
     wasmJs {
-        moduleName = "peopleinspace"
         browser {
             commonWebpackConfig {
                 outputFileName = "peopleinspace.js"

gradle/libs.versions.toml

@@ -1,16 +1,16 @@
 [versions]
-kotlin = "2.1.21"
-ksp = "2.1.21-2.0.1"
+kotlin = "2.2.0"
+ksp = "2.2.0-2.0.2"
 
-compose-multiplatform = "1.8.1"
+compose-multiplatform = "1.8.2"
 composeUiTooling = "1.4.1"
 coroutines = "1.10.2"
-kotlinxSerialization = "1.8.1"
-androidGradlePlugin = "8.9.3"
-koin = "4.0.4"
-koinCompose = "4.0.4"
-koinComposeMultiplatform = "4.0.4"
-ktor = "3.1.1"
+kotlinxSerialization = "1.9.0"
+androidGradlePlugin = "8.11.0"
+koin = "4.1.0"
+koinCompose = "4.1.0"
+koinComposeMultiplatform = "4.1.0"
+ktor = "3.2.1"
 osmdroidAndroid = "6.1.20"
 osmAndroidCompose = "0.0.5"
 slf4j = "2.0.17"
@@ -19,34 +19,34 @@ sqlJs = "1.8.0"
 webPackPlugin = "9.1.0"
 
 
-androidxActivity = "1.10.0"
-androidxComposeBom = "2025.01.01"
-material3-adaptive = "1.0.0"
-material3-adaptive-navigation-suite = "1.3.1"
-androidxNavigationCompose = "2.8.6"
-uiToolingPreview = "1.7.7"
-wearCompose = "1.4.0"
-androidxLifecycle = "2.8.7"
-androidxLifecycleKMP = "2.8.4"
+androidxActivity = "1.10.1"
+androidxComposeBom = "2025.06.01"
+material3-adaptive = "1.1.0"
+material3-adaptive-navigation-suite = "1.3.2"
+androidxNavigationCompose = "2.9.1"
+uiToolingPreview = "1.8.3"
+wearCompose = "1.4.1"
+androidxLifecycle = "2.9.1"
+androidxLifecycleKMP = "2.9.1"
 
 coilCompose = "2.7.0"
-coilCompose3 = "3.1.0"
+coilCompose3 = "3.2.0"
 
-horologist = "0.6.20"
+horologist = "0.6.23"
 glanceWearTiles = "1.0.0-alpha05"
-glanceAppWidget = "1.0.0"
-okhttp = "5.0.0-alpha.14"
-kermit = "2.0.5"
+glanceAppWidget = "1.1.1"
+okhttp = "5.0.0"
+kermit = "2.0.6"
 
-gradleVersionsPlugin = "0.51.0"
+gradleVersionsPlugin = "0.52.0"
 shadowPlugin = "8.1.1"
-skie = "0.10.2"
+skie = "0.10.4"
 
 mcp = "0.5.0"
 
 minSdk = "24"
-compileSdk = "35"
-targetSdk = "34"
+compileSdk = "36"
+targetSdk = "36"
 minWearSdk = "26"
 targetWearSdk = "33"
 

gradle/wrapper/gradle-wrapper.properties

@@ -2,6 +2,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 networkTimeout=10000
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists