diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml index 131e44d..1e16934 100644 --- a/.idea/kotlinc.xml +++ b/.idea/kotlinc.xml @@ -1,6 +1,6 @@ - \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index 7fa622c..2da0296 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -13,7 +13,7 @@ buildscript { allprojects { group = "com.rickclephas.kmp" - version = "1.0.0-BETA-10" + version = "1.0.0-BETA-10-kotlin-2.1.21-RC2" repositories { mavenCentral() diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 604a2f8..dbb72c2 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -kotlin = "2.1.20" +kotlin = "2.1.21" kotlinx-coroutines = "1.10.1" android = "8.2.0" androidx-lifecycle = "2.8.7" @@ -8,8 +8,8 @@ atomicfu = "0.26.1" # Sample versions androidx-compose = "2023.10.01" androidx-fragment = "1.6.2" -ksp = "2.1.20-1.0.31" -nativecoroutines = "1.0.0-ALPHA-41" +ksp = "2.1.21-2.0.1" +nativecoroutines = "1.0.0-ALPHA-43" [libraries] kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" } diff --git a/sample/shared/src/commonMain/kotlin/com/rickclephas/kmp/observableviewmodel/sample/shared/TimeTravelViewModel.kt b/sample/shared/src/commonMain/kotlin/com/rickclephas/kmp/observableviewmodel/sample/shared/TimeTravelViewModel.kt index 596a966..2fa83e9 100644 --- a/sample/shared/src/commonMain/kotlin/com/rickclephas/kmp/observableviewmodel/sample/shared/TimeTravelViewModel.kt +++ b/sample/shared/src/commonMain/kotlin/com/rickclephas/kmp/observableviewmodel/sample/shared/TimeTravelViewModel.kt @@ -13,7 +13,7 @@ open class TimeTravelViewModel: ViewModel() { * A [StateFlow] that emits the actual time. */ @NativeCoroutinesState - val actualTime = clockTime.map { formatTime(it) } + val actualTime: StateFlow = clockTime.map { formatTime(it) } .stateIn(viewModelScope, SharingStarted.WhileSubscribed(), "N/A") private val _travelEffect = MutableStateFlow(viewModelScope, null) @@ -21,7 +21,7 @@ open class TimeTravelViewModel: ViewModel() { * A [StateFlow] that emits the applied [TravelEffect]. */ @NativeCoroutinesState - val travelEffect = _travelEffect.asStateFlow() + val travelEffect: StateFlow = _travelEffect.asStateFlow() /** * A [StateFlow] that indicates if the [currentTime] is fixed. @@ -29,14 +29,14 @@ open class TimeTravelViewModel: ViewModel() { * @see stopTime */ @NativeCoroutinesState - val isFixedTime = _travelEffect.map { it is TravelEffect.Fixed } + val isFixedTime: StateFlow = _travelEffect.map { it is TravelEffect.Fixed } .stateIn(viewModelScope, SharingStarted.WhileSubscribed(), false) /** * A [StateFlow] that emits the current time. */ @NativeCoroutinesState - val currentTime = combine(clockTime, _travelEffect) { actualTime, travelEffect -> + val currentTime: StateFlow = combine(clockTime, _travelEffect) { actualTime, travelEffect -> formatTime(actualTime + travelEffect) }.stateIn(viewModelScope, SharingStarted.WhileSubscribed(), "N/A")