Merge pull request #3 from rickclephas/feature/kotlin-1.8.0

Kotlin 1.8.0

Author: rickclephas

.idea/kotlinc.xml

@@ -51,6 +51,30 @@ open class TimeTravelViewModel: KMMViewModel() {
 You need to use `viewModelScope` wherever possible to propagate state changes to iOS.  
 In other cases you can access the `ViewModelScope.coroutineScope` property directly.
 
+### KMP-NativeCoroutines
+
+Use the `@NativeCoroutinesState` annotation from [KMP-NativeCoroutines](https://github.com/rickclephas/KMP-NativeCoroutines)
+to turn your `StateFlow`s into properties in Swift:
+
+```kotlin
+@NativeCoroutinesState
+val travelEffect = _travelEffect.asStateFlow()
+```
+
+Checkout the [README](https://github.com/rickclephas/KMP-NativeCoroutines/blob/dev-1.0/README.md)
+for more information and installation instructions for KMP-NativeCoroutines.
+
+<details><summary>Alternative</summary>
+<p>
+
+Alternatively you can create extension properties in your iOS source-set yourself:
+```kotlin
+val TimeTravelViewModel.travelEffectValue: TravelEffect?
+    get() = travelEffect.value
+```
+</p>
+</details>
+
 ## Android
 
 Add the library to your Android module:

README.md

@@ -8,7 +8,7 @@ buildscript {
 
 allprojects {
     group = "com.rickclephas.kmm"
-    version = "1.0.0-ALPHA-2"
+    version = "1.0.0-ALPHA-2-kotlin-1.8.0-RC2"
 
     repositories {
         mavenCentral()

build.gradle.kts

@@ -1,4 +1,5 @@
 kotlin.code.style=official
+kotlin.mpp.androidSourceSetLayoutVersion=2
 kotlin.mpp.enableCInteropCommonization=true
 kotlin.native.binary.memoryModel=experimental
 android.useAndroidX=true

gradle.properties

@@ -1,12 +1,14 @@
 [versions]
-kotlin = "1.7.21"
+kotlin = "1.8.0"
 kotlinx-coroutines = "1.6.4"
 android = "7.3.1"
 androidx-lifecycle = "2.5.1"
 
 # Sample versions
 androidx-compose = "2022.11.00"
 androidx-fragment = "1.5.4"
+ksp = "1.8.0-RC2-1.0.8"
+nativecoroutines = "1.0.0-ALPHA-3"
 
 [libraries]
 kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
@@ -30,3 +32,5 @@ android-library = { id = "com.android.library", version.ref = "android" }
 # Sample plugins
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 android-application = { id = "com.android.application", version.ref = "android" }
+ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
+nativecoroutines = { id = "com.rickclephas.kmp.nativecoroutines", version.ref = "nativecoroutines" }

gradle/libs.versions.toml

@@ -19,7 +19,7 @@ android {
         compose = true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion = "1.4.0-alpha02"
+        kotlinCompilerExtensionVersion = "1.4.0-dev-k1.8.0-RC-4c1865595ed"
     }
     packagingOptions {
         resources {
@@ -33,6 +33,13 @@ android {
     }
 }
 
+// Ignore Compose Kotlin version compatibility check
+tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile::class.java).configureEach {
+    kotlinOptions {
+        freeCompilerArgs += listOf("-P", "plugin:androidx.compose.compiler.plugins.kotlin:suppressKotlinVersionCompatibilityCheck=true")
+    }
+}
+
 dependencies {
     implementation(project(":shared"))
     implementation(platform(libs.androidx.compose.bom))

sample/androidApp/build.gradle.kts

@@ -10,5 +10,6 @@ allprojects {
     repositories {
         mavenCentral()
         google()
+        maven("https://androidx.dev/storage/compose-compiler/repository/")
     }
-}
+}

sample/build.gradle.kts

@@ -9,5 +9,6 @@ android.useAndroidX=true
 android.nonTransitiveRClass=true
 
 #MPP
+kotlin.mpp.androidSourceSetLayoutVersion=2
 kotlin.mpp.enableCInteropCommonization=true
 kotlin.native.binary.memoryModel=experimental

sample/gradle.properties

@@ -13,7 +13,7 @@ struct ContentView: View {
     @StateViewModel var viewModel = TimeTravelViewModel()
 
     private var isFixedTimeBinding: Binding<Bool> {
-        Binding { viewModel.isFixedTimeValue } set: { isFixedTime in
+        Binding { viewModel.isFixedTime } set: { isFixedTime in
             if isFixedTime {
                 viewModel.stopTime()
             } else {
@@ -27,19 +27,19 @@ struct ContentView: View {
             Spacer()
             Group {
                 Text("Actual time:")
-                Text(viewModel.actualTimeValue)
+                Text(viewModel.actualTime)
                     .font(.system(size: 20))
             }
             Group {
                 Spacer().frame(height: 24)
                 Text("Travel effect:")
-                Text(viewModel.travelEffectValue?.description ?? "nil")
+                Text(viewModel.travelEffect?.description ?? "nil")
                     .font(.system(size: 20))
             }
             Group {
                 Spacer().frame(height: 24)
                 Text("Current time:")
-                Text(viewModel.currentTimeValue)
+                Text(viewModel.currentTime)
                     .font(.system(size: 20))
             }
             Group {

sample/iosApp/KMMViewModelSample/ContentView.swift

@@ -10,6 +10,7 @@ dependencyResolutionManagement {
     repositories {
         google()
         mavenCentral()
+        maven("https://androidx.dev/storage/compose-compiler/repository/")
     }
 }