Merge branch 'master' into feature/kotlin-2.2.0

Author: rickclephas

KMPObservableViewModelCore.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name       = 'KMPObservableViewModelCore'
-  s.version    = '1.0.0-BETA-10'
+  s.version    = '1.0.0-BETA-11'
   s.summary    = 'Library to share Kotlin ViewModels with Swift'
 
   s.homepage   = 'https://github.com/rickclephas/KMP-ObservableViewModel'

KMPObservableViewModelCoreObjC.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name       = 'KMPObservableViewModelCoreObjC'
-  s.version    = '1.0.0-BETA-10'
+  s.version    = '1.0.0-BETA-11'
   s.summary    = 'Library to share Kotlin ViewModels with Swift'
 
   s.homepage   = 'https://github.com/rickclephas/KMP-ObservableViewModel'

KMPObservableViewModelSwiftUI.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name       = 'KMPObservableViewModelSwiftUI'
-  s.version    = '1.0.0-BETA-10'
+  s.version    = '1.0.0-BETA-11'
   s.summary    = 'Library to share Kotlin ViewModels with SwiftUI'
 
   s.homepage   = 'https://github.com/rickclephas/KMP-ObservableViewModel'

README.md

@@ -21,19 +21,21 @@ but not all targets support AndroidX and/or SwiftUI interop:
 | JS         |      ✅      |    -     |    -    |
 | Wasm       |      ✅      |    -     |    -    |
 
-The latest version of the library uses Kotlin version `2.1.20`.  
+The latest version of the library uses Kotlin version `2.1.21`.  
 Compatibility versions for older and/or preview Kotlin versions are also available:
 
-| Version      | Version suffix       |   Kotlin   | Coroutines | AndroidX Lifecycle |
-|--------------|----------------------|:----------:|:----------:|:------------------:|
-| **_latest_** | **_no suffix_**      | **2.1.20** | **1.10.1** |     **2.8.7**      |
-| 1.0.0-BETA-9 | _no suffix_          |   2.1.10   |   1.10.1   |       2.8.7        |
-| 1.0.0-BETA-8 | _no suffix_          |   2.1.0    |   1.9.0    |       2.8.4        |
-| 1.0.0-BETA-7 | _no suffix_          |   2.0.21   |   1.9.0    |       2.8.4        |
-| 1.0.0-BETA-6 | _no suffix_          |   2.0.20   |   1.9.0    |       2.8.4        |
-| 1.0.0-BETA-4 | _no suffix_          |   2.0.10   |   1.8.1    |       2.8.4        |
-| 1.0.0-BETA-3 | _no suffix_          |   2.0.0    |   1.8.1    |       2.8.0        |
-| 1.0.0-BETA-2 | _no suffix_          |   1.9.24   |   1.8.1    |       2.8.0        |
+| Version       | Version suffix      |   Kotlin    | Coroutines | AndroidX Lifecycle |
+|---------------|---------------------|:-----------:|:----------:|:------------------:|
+| _latest_      | -kotlin-2.2.0-Beta1 | 2.2.0-Beta1 |   1.10.1   |       2.8.7        |
+| **_latest_**  | **_no suffix_**     | **2.1.21**  | **1.10.1** |     **2.8.7**      |
+| 1.0.0-BETA-10 | _no suffix_         |   2.1.20    |   1.10.1   |       2.8.7        |
+| 1.0.0-BETA-9  | _no suffix_         |   2.1.10    |   1.10.1   |       2.8.7        |
+| 1.0.0-BETA-8  | _no suffix_         |    2.1.0    |   1.9.0    |       2.8.4        |
+| 1.0.0-BETA-7  | _no suffix_         |   2.0.21    |   1.9.0    |       2.8.4        |
+| 1.0.0-BETA-6  | _no suffix_         |   2.0.20    |   1.9.0    |       2.8.4        |
+| 1.0.0-BETA-4  | _no suffix_         |   2.0.10    |   1.8.1    |       2.8.4        |
+| 1.0.0-BETA-3  | _no suffix_         |    2.0.0    |   1.8.1    |       2.8.0        |
+| 1.0.0-BETA-2  | _no suffix_         |   1.9.24    |   1.8.1    |       2.8.0        |
 
 ## Kotlin
 
@@ -46,7 +48,7 @@ kotlin {
         }
         commonMain {
             dependencies {
-                api("com.rickclephas.kmp:kmp-observableviewmodel-core:1.0.0-BETA-10")
+                api("com.rickclephas.kmp:kmp-observableviewmodel-core:1.0.0-BETA-11")
             }
         }
     }
@@ -153,7 +155,7 @@ After you have configured your `shared` Kotlin module and created a ViewModel it
 Start by adding the Swift package to your `Package.swift` file:
 ```swift
 dependencies: [
-    .package(url: "https://github.com/rickclephas/KMP-ObservableViewModel.git", from: "1.0.0-BETA-10")
+    .package(url: "https://github.com/rickclephas/KMP-ObservableViewModel.git", from: "1.0.0-BETA-11")
 ]
 ```
 
@@ -165,7 +167,7 @@ Or add it in Xcode by going to `File` > `Add Packages...` and providing the URL:
 
 If you like you can also use CocoaPods instead of SPM:
 ```ruby
-pod 'KMPObservableViewModelSwiftUI', '1.0.0-BETA-10'
+pod 'KMPObservableViewModelSwiftUI', '1.0.0-BETA-11'
 ```
 </p>
 </details>

build.gradle.kts

@@ -13,7 +13,7 @@ buildscript {
 
 allprojects {
     group = "com.rickclephas.kmp"
-    version = "1.0.0-BETA-10-kotlin-2.2.0-Beta1"
+    version = "1.0.0-BETA-11"
 
     repositories {
         mavenCentral()

sample/shared/src/commonMain/kotlin/com/rickclephas/kmp/observableviewmodel/sample/shared/TimeTravelViewModel.kt

@@ -13,30 +13,30 @@ open class TimeTravelViewModel: ViewModel() {
      * A [StateFlow] that emits the actual time.
      */
     @NativeCoroutinesState
-    val actualTime = clockTime.map { formatTime(it) }
+    val actualTime: StateFlow<String> = clockTime.map { formatTime(it) }
         .stateIn(viewModelScope, SharingStarted.WhileSubscribed(), "N/A")
 
     private val _travelEffect = MutableStateFlow<TravelEffect?>(viewModelScope, null)
     /**
      * A [StateFlow] that emits the applied [TravelEffect].
      */
     @NativeCoroutinesState
-    val travelEffect = _travelEffect.asStateFlow()
+    val travelEffect: StateFlow<TravelEffect?> = _travelEffect.asStateFlow()
 
     /**
      * A [StateFlow] that indicates if the [currentTime] is fixed.
      * @see startTime
      * @see stopTime
      */
     @NativeCoroutinesState
-    val isFixedTime = _travelEffect.map { it is TravelEffect.Fixed }
+    val isFixedTime: StateFlow<Boolean> = _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<String> = combine(clockTime, _travelEffect) { actualTime, travelEffect ->
         formatTime(actualTime + travelEffect)
     }.stateIn(viewModelScope, SharingStarted.WhileSubscribed(), "N/A")