Kotlin 2.0.0

.gitignore

@@ -1,3 +1,4 @@
+.kotlin/
 local.properties
 
 # Created by https://www.toptal.com/developers/gitignore/api/swift,xcode,gradle,kotlin,intellij

build.gradle.kts

@@ -21,7 +21,7 @@ buildscript {
 
 allprojects {
     group = "com.rickclephas.kmp"
-    version = "1.0.0-BETA-2"
+    version = "1.0.0-BETA-2-kotlin-2.0.0-RC3"
 
     repositories {
         mavenCentral()

gradle/libs.versions.toml

@@ -1,16 +1,15 @@
 [versions]
-kotlin = "1.9.24"
+kotlin = "2.0.0"
 kotlinx-coroutines = "1.8.1"
 android = "8.2.0"
 androidx-lifecycle = "2.8.0"
 atomicfu = "0.24.0"
 
 # Sample versions
 androidx-compose = "2023.10.01"
-androidx-compose-compiler = "1.5.8-dev-k1.9.22-42b6ec2b037"
 androidx-fragment = "1.6.2"
-ksp = "1.9.24-1.0.20"
-nativecoroutines = "1.0.0-ALPHA-30"
+ksp = "2.0.0-1.0.21"
+nativecoroutines = "1.0.0-ALPHA-31"
 
 [libraries]
 kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
@@ -34,6 +33,7 @@ android-library = { id = "com.android.library", version.ref = "android" }
 
 # Sample plugins
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", 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" }

kmp-observableviewmodel-core/build.gradle.kts

@@ -73,8 +73,10 @@ kotlin {
 
     targets.all {
         compilations.all {
-            compilerOptions.configure {
-                freeCompilerArgs.add("-Xexpect-actual-classes")
+            compileTaskProvider.configure {
+                compilerOptions {
+                    freeCompilerArgs.add("-Xexpect-actual-classes")
+                }
             }
         }
     }

sample/androidApp/build.gradle.kts

@@ -1,6 +1,7 @@
 plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.compose.compiler)
 }
 
 android {
@@ -16,9 +17,6 @@ android {
     buildFeatures {
         compose = true
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.androidx.compose.compiler.get()
-    }
     packaging {
         resources {
             excludes += "/META-INF/{AL2.0,LGPL2.1}"
@@ -35,13 +33,6 @@ kotlin {
     jvmToolchain(11)
 }
 
-// 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/build.gradle.kts

@@ -3,6 +3,7 @@ plugins {
     alias(libs.plugins.android.library) apply false
     alias(libs.plugins.kotlin.android) apply false
     alias(libs.plugins.kotlin.multiplatform) apply false
+    alias(libs.plugins.compose.compiler) apply false
 }
 
 buildscript {