Kotlin 2.0

motorro · May 30, 2024 · e9827a1 · e9827a1
1 parent 279fdd9
commit e9827a1
Show file tree

Hide file tree

Showing 21 changed files with 185 additions and 122 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,8 +8,11 @@
 /.idea/workspace.xml
 /.idea/navEditor.xml
 /.idea/assetWizardSettings.xml
+/.idea/copilot
+/.idea/*.xd
 .DS_Store
 /build
+/.kotlin
 build
 /captures
 .externalNativeBuild

diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/migrations.xml b/.idea/migrations.xml
diff --git a/build.gradle b/build.gradle
@@ -20,6 +20,7 @@ plugins {
     alias(libs.plugins.kotlin.jvm) apply(false)
     alias(libs.plugins.kotlin.android) apply(false)
     alias(libs.plugins.kotlin.kapt) apply(false)
+    alias(libs.plugins.compose) apply(false)
     alias(libs.plugins.kotlin.dokka) apply(false)
     alias(libs.plugins.hilt) apply(false)
     alias(libs.plugins.nexus.publish)

diff --git a/commonstatemachine/build.gradle.kts b/commonstatemachine/build.gradle.kts
@@ -90,13 +90,11 @@ kotlin {
         val jvmMain by getting
         val jvmTest by getting
         val androidMain by getting {
-            dependsOn(jvmMain)
             dependencies {
                 api(libs.androidx.lifecycle.common)
             }
         }
         val androidUnitTest by getting {
-            dependsOn(commonTest)
             dependencies {
                 implementation(libs.kotlin.coroutines.core)
                 implementation(libs.test.kotlin.coroutines)
@@ -108,21 +106,11 @@ kotlin {
         val iosX64Main by getting
         val iosArm64Main by getting
         val iosSimulatorArm64Main by getting
-        val iosMain by creating {
-            dependsOn(commonMain)
-            iosX64Main.dependsOn(this)
-            iosArm64Main.dependsOn(this)
-            iosSimulatorArm64Main.dependsOn(this)
-        }
+        val iosMain by creating
         val iosX64Test by getting
         val iosArm64Test by getting
         val iosSimulatorArm64Test by getting
-        val iosTest by creating {
-            dependsOn(commonTest)
-            iosX64Test.dependsOn(this)
-            iosArm64Test.dependsOn(this)
-            iosSimulatorArm64Test.dependsOn(this)
-        }
+        val iosTest by creating
     }
     targets.all {
         compilations.all {

diff --git a/coroutines/build.gradle.kts b/coroutines/build.gradle.kts
@@ -91,32 +91,18 @@ kotlin {
         }
         val jvmMain by getting
         val jvmTest by getting
-        val androidMain by getting {
-            dependsOn(jvmMain)
-        }
-        val androidUnitTest by getting {
-            dependsOn(commonTest)
-        }
+        val androidMain by getting
+        val androidUnitTest by getting
         val jsMain by getting
         val jsTest by getting
         val iosX64Main by getting
         val iosArm64Main by getting
         val iosSimulatorArm64Main by getting
-        val iosMain by creating {
-            dependsOn(commonMain)
-            iosX64Main.dependsOn(this)
-            iosArm64Main.dependsOn(this)
-            iosSimulatorArm64Main.dependsOn(this)
-        }
+        val iosMain by creating
         val iosX64Test by getting
         val iosArm64Test by getting
         val iosSimulatorArm64Test by getting
-        val iosTest by creating {
-            dependsOn(commonTest)
-            iosX64Test.dependsOn(this)
-            iosArm64Test.dependsOn(this)
-            iosSimulatorArm64Test.dependsOn(this)
-        }
+        val iosTest by creating
     }
     targets.all {
         compilations.all {

diff --git a/examples/androidcore/build.gradle b/examples/androidcore/build.gradle
@@ -15,6 +15,7 @@ plugins {
     id "com.android.library"
     id "org.jetbrains.kotlin.android"
     id "org.jetbrains.kotlin.kapt"
+    id "org.jetbrains.kotlin.plugin.compose"
 }
 
 android {
@@ -45,19 +46,27 @@ android {
     buildFeatures {
         compose true
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion libs.versions.compose.compiler.get()
-    }
     namespace 'com.motorro.statemachine.androidcore'
 }
 
+composeCompiler {
+    enableStrongSkippingMode = true
+
+    reportsDestination = layout.buildDirectory.dir("compose_compiler")
+    stabilityConfigurationFile = rootProject.layout.projectDirectory.file("stability_config.conf")
+}
+
 dependencies {
     api libs.timber
 
     coreLibraryDesugaring libs.desugaring
 
     implementation libs.kotlin.coroutines.core
 
+    def composeBom = platform(libs.compose.bom)
+    implementation composeBom
+    androidTestImplementation composeBom
+
     implementation libs.bundles.compose.core
     implementation libs.compose.activity
     implementation libs.compose.foundation

diff --git a/examples/lce/build.gradle b/examples/lce/build.gradle
@@ -14,6 +14,7 @@
 plugins {
     id "com.android.application"
     id "org.jetbrains.kotlin.android"
+    id "org.jetbrains.kotlin.plugin.compose"
 }
 
 android {
@@ -49,9 +50,6 @@ android {
     buildFeatures {
         compose true
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion libs.versions.compose.compiler.get()
-    }
     packagingOptions {
         resources {
             excludes += '/META-INF/{AL2.0,LGPL2.1}'
@@ -60,6 +58,13 @@ android {
     namespace 'com.motorro.statemachine.lce'
 }
 
+composeCompiler {
+    enableStrongSkippingMode = true
+
+    reportsDestination = layout.buildDirectory.dir("compose_compiler")
+    stabilityConfigurationFile = rootProject.layout.projectDirectory.file("stability_config.conf")
+}
+
 dependencies {
     implementation project(path: ':commonstatemachine')
     implementation project(path: ':coroutines')
@@ -78,6 +83,10 @@ dependencies {
     implementation libs.kotlin.coroutines.core
     implementation libs.kotlin.coroutines.android
 
+    def composeBom = platform(libs.compose.bom)
+    implementation composeBom
+    androidTestImplementation composeBom
+
     implementation libs.bundles.compose.core
     implementation libs.compose.activity
     implementation libs.compose.viewmodel

diff --git a/examples/lifecycle/build.gradle.kts b/examples/lifecycle/build.gradle.kts
@@ -15,6 +15,7 @@
 plugins {
     alias(libs.plugins.android.app)
     alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.compose)
 }
 
 val versionCode: String by project.extra
@@ -60,16 +61,20 @@ android {
     buildFeatures {
         compose = true
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
-    }
     packaging {
         resources {
             excludes += "/META-INF/{AL2.0,LGPL2.1}"
         }
     }
 }
 
+composeCompiler {
+    enableStrongSkippingMode.set(true)
+
+    reportsDestination.set(layout.buildDirectory.dir("compose_compiler"))
+    stabilityConfigurationFile.set(rootProject.layout.projectDirectory.file("stability_config.conf"))
+}
+
 dependencies {
     implementation(project(":commonstatemachine"))
     implementation(project(":coroutines"))
@@ -87,6 +92,10 @@ dependencies {
     implementation(libs.kotlin.coroutines.core)
     implementation(libs.kotlin.coroutines.android)
 
+    val composeBom = platform(libs.compose.bom)
+    implementation(composeBom)
+    androidTestImplementation(composeBom)
+
     implementation(libs.bundles.compose.core)
     implementation(libs.compose.activity)
     implementation(libs.compose.viewmodel)

diff --git a/examples/multi/mixed/build.gradle.kts b/examples/multi/mixed/build.gradle.kts
@@ -15,6 +15,7 @@
 plugins {
     alias(libs.plugins.android.app)
     alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.compose)
 }
 
 val versionCode: String by project.extra
@@ -60,16 +61,20 @@ android {
     buildFeatures {
         compose = true
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
-    }
     packaging {
         resources {
             excludes += "/META-INF/{AL2.0,LGPL2.1}"
         }
     }
 }
 
+composeCompiler {
+    enableStrongSkippingMode.set(true)
+
+    reportsDestination.set(layout.buildDirectory.dir("compose_compiler"))
+    stabilityConfigurationFile.set(rootProject.layout.projectDirectory.file("stability_config.conf"))
+}
+
 dependencies {
     implementation(project(":commonstatemachine"))
     implementation(project(":coroutines"))
@@ -87,6 +92,10 @@ dependencies {
     implementation(libs.kotlin.coroutines.core)
     implementation(libs.kotlin.coroutines.android)
 
+    val composeBom = platform(libs.compose.bom)
+    implementation(composeBom)
+    androidTestImplementation(composeBom)
+
     implementation(libs.bundles.compose.core)
     implementation(libs.compose.activity)
     implementation(libs.compose.viewmodel)

diff --git a/examples/multi/navbar/build.gradle.kts b/examples/multi/navbar/build.gradle.kts
@@ -15,6 +15,7 @@
 plugins {
     alias(libs.plugins.android.app)
     alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.compose)
 }
 
 val versionCode: String by project.extra
@@ -60,16 +61,20 @@ android {
     buildFeatures {
         compose = true
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
-    }
     packaging {
         resources {
             excludes += "/META-INF/{AL2.0,LGPL2.1}"
         }
     }
 }
 
+composeCompiler {
+    enableStrongSkippingMode.set(true)
+
+    reportsDestination.set(layout.buildDirectory.dir("compose_compiler"))
+    stabilityConfigurationFile.set(rootProject.layout.projectDirectory.file("stability_config.conf"))
+}
+
 dependencies {
     implementation(project(":commonstatemachine"))
     implementation(project(":coroutines"))
@@ -87,6 +92,10 @@ dependencies {
     implementation(libs.kotlin.coroutines.core)
     implementation(libs.kotlin.coroutines.android)
 
+    val composeBom = platform(libs.compose.bom)
+    implementation(composeBom)
+    androidTestImplementation(composeBom)
+
     implementation(libs.bundles.compose.core)
     implementation(libs.compose.activity)
     implementation(libs.compose.viewmodel)

diff --git a/examples/multi/parallel/build.gradle.kts b/examples/multi/parallel/build.gradle.kts
@@ -15,6 +15,7 @@
 plugins {
     alias(libs.plugins.android.app)
     alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.compose)
 }
 
 val versionCode: String by project.extra
@@ -60,16 +61,20 @@ android {
     buildFeatures {
         compose = true
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
-    }
     packaging {
         resources {
             excludes += "/META-INF/{AL2.0,LGPL2.1}"
         }
     }
 }
 
+composeCompiler {
+    enableStrongSkippingMode.set(true)
+
+    reportsDestination.set(layout.buildDirectory.dir("compose_compiler"))
+    stabilityConfigurationFile.set(rootProject.layout.projectDirectory.file("stability_config.conf"))
+}
+
 dependencies {
     implementation(project(":commonstatemachine"))
     implementation(project(":coroutines"))
@@ -87,6 +92,10 @@ dependencies {
     implementation(libs.kotlin.coroutines.core)
     implementation(libs.kotlin.coroutines.android)
 
+    val composeBom = platform(libs.compose.bom)
+    implementation(composeBom)
+    androidTestImplementation(composeBom)
+
     implementation(libs.bundles.compose.core)
     implementation(libs.compose.activity)
     implementation(libs.compose.viewmodel)