update project: Navigation 3 (Android) + iOS 17 API + Gradle 9.1

README.md

@@ -20,7 +20,7 @@ The app uses the following multiplatform dependencies in its implementation:
 - [Ktor](https://ktor.io/) for networking
 - [kotlinx.serialization](https://github.com/Kotlin/kotlinx.serialization) for JSON handling
 - [Koin](https://github.com/InsertKoinIO/koin) for dependency injection
-- [KMP-ObservableViewModel](https://github.com/rickclephas/KMP-ObservableViewModel) for shared ViewModel implementations in common code
+- [AndroidX Lifecycle ViewModel](https://developer.android.com/jetpack/androidx/releases/lifecycle) for shared ViewModel implementations
 - [KMP-NativeCoroutines](https://github.com/rickclephas/KMP-NativeCoroutines)
 
 > These are just some of the possible libraries to use for these tasks with Kotlin Multiplatform, and their usage here isn't a strong recommendation for these specific libraries over the available alternatives. You can find a wide variety of curated multiplatform libraries in the [kmp-awesome](https://github.com/terrakok/kmp-awesome) repository.

androidApp/build.gradle.kts

@@ -0,0 +1,58 @@
+plugins {
+    alias(libs.plugins.androidApplication)
+    alias(libs.plugins.composeCompiler)
+    alias(libs.plugins.kotlinxSerialization)
+}
+
+android {
+    namespace = "com.jetbrains.kmpapp"
+    compileSdk = 36
+
+    defaultConfig {
+        applicationId = "com.jetbrains.kmpapp"
+        minSdk = 24
+        targetSdk = 35
+        versionCode = 1
+        versionName = "1.0"
+    }
+    packaging {
+        resources {
+            excludes += "/META-INF/{AL2.0,LGPL2.1}"
+        }
+    }
+    buildTypes {
+        getByName("release") {
+            isMinifyEnabled = false
+        }
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+    kotlin {
+        compilerOptions {
+            jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11)
+        }
+    }
+}
+
+dependencies {
+    implementation(platform(libs.androidx.compose.bom))
+    implementation(libs.androidx.compose.ui)
+    implementation(libs.androidx.compose.foundation)
+    implementation(libs.androidx.compose.material3)
+    implementation(libs.androidx.compose.material.icons)
+    implementation(libs.androidx.compose.runtime)
+    implementation(libs.androidx.compose.ui.tooling.preview)
+    implementation(libs.androidx.activity.compose)
+    implementation(libs.androidx.viewmodel.compose)
+    implementation(libs.androidx.navigation3.runtime)
+    implementation(libs.androidx.navigation3.ui)
+    implementation(libs.androidx.lifecycle.viewmodel.navigation3)
+    implementation(libs.koin.androidx.compose)
+    implementation(libs.coil.compose)
+    implementation(libs.coil.network.ktor)
+    implementation(projects.shared)
+    implementation(libs.kotlinx.serialization.core)
+    debugImplementation(libs.androidx.compose.ui.tooling)
+}

androidApp/src/main/kotlin/com/jetbrains/kmpapp/App.kt

@@ -0,0 +1,57 @@
+package com.jetbrains.kmpapp
+
+import androidx.compose.foundation.isSystemInDarkTheme
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.material3.darkColorScheme
+import androidx.compose.material3.lightColorScheme
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.mutableStateListOf
+import androidx.compose.runtime.remember
+import androidx.lifecycle.viewmodel.navigation3.rememberViewModelStoreNavEntryDecorator
+import androidx.navigation3.runtime.NavEntry
+import androidx.navigation3.ui.NavDisplay
+import com.jetbrains.kmpapp.screens.DetailScreen
+import com.jetbrains.kmpapp.screens.ListScreen
+import kotlinx.serialization.Serializable
+
+@Serializable
+data object ListDestination
+
+@Serializable
+data class DetailDestination(val objectId: Int)
+
+@Composable
+fun App() {
+    MaterialTheme(
+        colorScheme = if (isSystemInDarkTheme()) darkColorScheme() else lightColorScheme()
+    ) {
+        Surface {
+            val backStack = remember { mutableStateListOf<Any>(ListDestination) }
+
+            NavDisplay(
+                backStack = backStack,
+                onBack = { backStack.removeLastOrNull() },
+                entryDecorators = listOf(
+                    rememberViewModelStoreNavEntryDecorator(),
+                ),
+                entryProvider = { key ->
+                    when (key) {
+                        is ListDestination -> NavEntry(key) {
+                            ListScreen(navigateToDetails = { objectId ->
+                                backStack.add(DetailDestination(objectId))
+                            })
+                        }
+                        is DetailDestination -> NavEntry(key) {
+                            DetailScreen(
+                                objectId = key.objectId,
+                                navigateBack = { backStack.removeLastOrNull() }
+                            )
+                        }
+                        else -> NavEntry(key) { }
+                    }
+                }
+            )
+        }
+    }
+}

build.gradle.kts

@@ -1,6 +1,7 @@
 plugins {
     alias(libs.plugins.androidApplication) apply false
     alias(libs.plugins.androidLibrary) apply false
+    alias(libs.plugins.androidKmpLibrary) apply false
     alias(libs.plugins.composeCompiler) apply false
     alias(libs.plugins.composeMultiplatform) apply false
     alias(libs.plugins.kotlinMultiplatform) apply false

gradle.properties

@@ -8,5 +8,3 @@ org.gradle.jvmargs=-Xmx2048M -Dfile.encoding=UTF-8
 android.nonTransitiveRClass=true
 android.useAndroidX=true
 
-# Workaround for https://youtrack.jetbrains.com/issue/KT-74278/, should be fixed in Kotlin 2.2.0
-kotlin.native.toolchain.enabled=false

gradle/libs.versions.toml

@@ -1,28 +1,35 @@
 [versions]
-agp = "8.9.3"
-androidx-activityCompose = "1.10.1"
-androidx-navigationCompose = "2.9.0"
-androidx-ui-tooling = "1.8.3"
-androidx-viewmodelCompose = "2.9.1"
-coil = "3.2.0"
-compose-multiplatform = "1.8.2"
-kmpObservableViewmodel = "1.0.0-BETA-12"
-kmpNativeCoroutines = "1.0.0-ALPHA-45"
-koin = "4.1.0"
-kotlin = "2.2.0"
-kotlinx-serialization = "1.8.1"
-ksp = "2.2.0-2.0.2"
-ktor = "3.1.3"
+agp = "9.0.0"
+androidx-activityCompose = "1.12.2"
+androidx-navigation3 = "1.0.0"
+androidx-ui-tooling = "1.10.1"
+androidx-viewmodelCompose = "2.10.0"
+coil = "3.3.0"
+compose-multiplatform = "1.10.0"
+kmpNativeCoroutines = "1.0.0"
+koin = "4.1.1"
+kotlin = "2.3.0"
+kotlinx-serialization = "1.9.0"
+ksp = "2.3.3"
+ktor = "3.3.3"
 
 [libraries]
 androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activityCompose" }
+androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version = "2026.01.00" }
+androidx-compose-ui = { group = "androidx.compose.ui", name = "ui" }
 androidx-compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "androidx-ui-tooling" }
 androidx-compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "androidx-ui-tooling" }
-androidx-navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "androidx-navigationCompose" }
+androidx-compose-foundation = { group = "androidx.compose.foundation", name = "foundation" }
+androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3" }
+androidx-compose-material-icons = { group = "androidx.compose.material", name = "material-icons-extended" }
+androidx-compose-runtime = { group = "androidx.compose.runtime", name = "runtime" }
+androidx-navigation3-runtime = { module = "androidx.navigation3:navigation3-runtime", version.ref = "androidx-navigation3" }
+androidx-navigation3-ui = { module = "androidx.navigation3:navigation3-ui", version.ref = "androidx-navigation3" }
 androidx-viewmodel-compose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "androidx-viewmodelCompose" }
 coil-compose = { group = "io.coil-kt.coil3", name = "coil-compose", version.ref = "coil" }
 coil-network-ktor = { group = "io.coil-kt.coil3", name = "coil-network-ktor3", version.ref = "coil" }
-kmp-observable-viewmodel = { module = "com.rickclephas.kmp:kmp-observableviewmodel-core", version.ref = "kmpObservableViewmodel" }
+androidx-lifecycle-viewmodel = { module = "androidx.lifecycle:lifecycle-viewmodel", version.ref = "androidx-viewmodelCompose" }
+androidx-lifecycle-viewmodel-navigation3 = { module = "androidx.lifecycle:lifecycle-viewmodel-navigation3", version.ref = "androidx-viewmodelCompose" }
 koin-androidx-compose = { module = "io.insert-koin:koin-androidx-compose", version.ref = "koin" }
 koin-core = { module = "io.insert-koin:koin-core", version.ref = "koin" }
 kotlinx-serialization-core = { module = "org.jetbrains.kotlinx:kotlinx-serialization-core", version.ref = "kotlinx-serialization" }
@@ -35,6 +42,7 @@ ktor-serialization-kotlinx-json = { module = "io.ktor:ktor-serialization-kotlinx
 [plugins]
 androidApplication = { id = "com.android.application", version.ref = "agp" }
 androidLibrary = { id = "com.android.library", version.ref = "agp" }
+androidKmpLibrary = { id = "com.android.kotlin.multiplatform.library", version.ref = "agp" }
 composeCompiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 composeMultiplatform = { id = "org.jetbrains.compose", version.ref = "compose-multiplatform" }
 kmpNativeCoroutines = { id = "com.rickclephas.kmp.nativecoroutines", version.ref = "kmpNativeCoroutines" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME