Merge pull request #290 from joreilly/dep_updates

dependency updates

Author: joreilly

README.md

@@ -1,6 +1,6 @@
 # BikeShare
 
-![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)
 
 Jetpack Compose and SwiftUI based Kotlin Multiplatform sample project (based on [CityBikes API](http://api.citybik.es/v2/)).
 

androidApp/proguard-rules.pro

@@ -20,4 +20,5 @@
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
 
--keep class dev.johnoreilly.** { *; }
+-keep class dev.johnoreilly.** { *; }
+-dontwarn okhttp3.internal.Util

common/build.gradle.kts

@@ -89,13 +89,13 @@ kotlin {
             implementation(libs.slf4j)
         }
     }
-}
 
-kotlin {
-    targets.withType<org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget> {
-        compilations.get("main").kotlinOptions.freeCompilerArgs += "-Xexport-kdoc"
+    compilerOptions {
+        freeCompilerArgs.add("-Xexport-kdoc")
     }
+}
 
+kotlin {
     targets.configureEach {
         val isAndroidTarget = platformType == KotlinPlatformType.androidJvm
         compilations.configureEach {

common/src/commonMain/kotlin/dev/johnoreilly/common/viewmodel/StationsViewModelShared.kt

@@ -4,9 +4,11 @@ import com.rickclephas.kmp.observableviewmodel.ViewModel
 import com.rickclephas.kmp.observableviewmodel.MutableStateFlow
 import com.rickclephas.kmp.observableviewmodel.stateIn
 import com.rickclephas.kmp.nativecoroutines.NativeCoroutinesState
+import dev.johnoreilly.common.remote.Station
 import dev.johnoreilly.common.repository.CityBikesRepository
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.filterNotNull
 import kotlinx.coroutines.flow.flatMapLatest
 import me.tatarka.inject.annotations.Inject
@@ -21,7 +23,7 @@ open class StationsViewModelShared(cityBikesRepository: CityBikesRepository) : V
     private val network = MutableStateFlow<String?>(viewModelScope, null)
 
     @NativeCoroutinesState
-    val stations = network.filterNotNull().flatMapLatest {
+    val stations: StateFlow<List<Station>> = network.filterNotNull().flatMapLatest {
         cityBikesRepository.pollNetworkUpdates(it)
     }.stateIn(viewModelScope, SharingStarted.WhileSubscribed(), emptyList())
 

compose-web/build.gradle.kts

@@ -11,7 +11,6 @@ version = "1.0-SNAPSHOT"
 kotlin {
     @Suppress("OPT_IN_USAGE")
     wasmJs {
-        moduleName = "bikeshare"
         browser {
             commonWebpackConfig {
                 outputFileName = "bikeshare.js"

fastlane/Fastfile

@@ -17,7 +17,7 @@ default_platform :android
 
 platform :android do
 
-    versionNum = 8
+    versionNum = 10
 
     before_all do
     end

gradle/libs.versions.toml

@@ -1,33 +1,33 @@
 [versions]
-kotlin = "2.1.21"
-ksp = "2.1.21-2.0.1"
+kotlin = "2.2.0"
+ksp = "2.2.0-2.0.2"
 
-androidGradlePlugin = "8.10.1"
+androidGradlePlugin = "8.11.0"
 androidxActivity = "1.10.1"
-androidxComposeBom = "2025.06.00"
+androidxComposeBom = "2025.06.01"
 androidxLifecycle = "2.9.1"
-androidxNavigationCompose = "2.9.0"
-androidxRoom = "2.7.1"
-circuit = "0.28.0"
-composeLifecyleRuntime="2.9.0"
-compose-multiplatform = "1.8.1"
-composeAdaptiveLayout = "1.1.1"
+androidxNavigationCompose = "2.9.1"
+androidxRoom = "2.7.2"
+circuit = "0.29.1"
+composeLifecyleRuntime="2.9.1"
+compose-multiplatform = "1.8.2"
+composeAdaptiveLayout = "1.1.2"
 coroutines = "1.10.2"
 junit = "4.13.2"
-kmpNativeCoroutines = "1.0.0-ALPHA-42"
-kmpObservableViewModel = "1.0.0-BETA-7"
+kmpNativeCoroutines = "1.0.0-ALPHA-45"
+kmpObservableViewModel = "1.0.0-BETA-12"
 kotlin-inject-anvil = "0.1.6"
 kotlininject = "0.8.0"
-kotlinxSerialization = "1.8.1"
-ktor = "3.1.2"
-okhttp = "5.0.0-alpha.14"
+kotlinxSerialization = "1.9.0"
+ktor = "3.2.1"
+okhttp = "5.0.0"
 slf4j = "2.0.17"
-slf4jAndroid = "2.0.7-0"
-sqlite = "2.5.1"
+slf4jAndroid = "2.0.17-0"
+sqlite = "2.5.2"
 
 minSdk = "24"
-targetSdk = "35"
-compileSdk = "35"
+targetSdk = "36"
+compileSdk = "36"
 
 
 [libraries]

gradle/wrapper/gradle-wrapper.properties

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