Build with kotlin 2.0.0

.gitignore

@@ -1,4 +1,5 @@
 .idea/
+.kotlin/
 .gradle
 *.iml
 /local.properties

README.md

@@ -20,6 +20,9 @@ Each [release](https://github.com/mirego/viewmodel-pilot/releases) outlines what
  <tr>
   <td><img alt="kotlin 1.9.23" src="https://img.shields.io/badge/kotlin-1.9.23-blue.svg?logo=kotlin" /></td><td><img alt="0.2.10" src="https://img.shields.io/maven-metadata/v?label=mirego-maven&versionPrefix=0.2.10&metadataUrl=https%3A%2F%2Fmirego-maven.s3.amazonaws.com%2Fpublic%2Fcom%2Fmirego%2Fpilot%2Fviewmodel%2Fmaven-metadata.xml"></td>
  </tr>
+ <tr>
+  <td><img alt="kotlin 2.0.0" src="https://img.shields.io/badge/kotlin-2.0.0-blue.svg?logo=kotlin" /></td><td><img alt="0.3.0" src="https://img.shields.io/maven-metadata/v?label=mirego-maven&versionPrefix=0.3.0&metadataUrl=https%3A%2F%2Fmirego-maven.s3.amazonaws.com%2Fpublic%2Fcom%2Fmirego%2Fpilot%2Fviewmodel%2Fmaven-metadata.xml"></td>
+ </tr>
 </table>
 
 ## Libraries

build.gradle.kts

@@ -6,6 +6,7 @@ plugins {
     alias(libs.plugins.ktlint) apply false
     alias(libs.plugins.mirego.publish) apply false
     alias(libs.plugins.kotlinx.binaryCompatibilityValidator) apply false
+    alias(libs.plugins.compose.compiler) apply false
     alias(libs.plugins.dokka)
 }
 

components/android/coil/build.gradle.kts

@@ -2,6 +2,7 @@
 
 plugins {
     id("buildlogic.android.library")
+    alias(libs.plugins.compose.compiler)
 }
 
 group = "com.mirego.pilot"
@@ -12,10 +13,6 @@ android {
     buildFeatures {
         compose = true
     }
-
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.androidx.compose.compiler.get()
-    }
 }
 
 dependencies {

components/android/material3/build.gradle.kts

@@ -2,6 +2,7 @@
 
 plugins {
     id("buildlogic.android.library")
+    alias(libs.plugins.compose.compiler)
 }
 
 group = "com.mirego.pilot"
@@ -12,10 +13,6 @@ android {
     buildFeatures {
         compose = true
     }
-
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.androidx.compose.compiler.get()
-    }
 }
 
 dependencies {

components/common/build.gradle.kts

@@ -1,21 +1,24 @@
 @file:Suppress("DSL_SCOPE_VIOLATION")
 
+import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType
+
 plugins {
     id("buildlogic.kotlin.multiplatform")
+    alias(libs.plugins.compose.compiler)
 }
 
 group = "com.mirego.pilot"
 
+composeCompiler {
+    targetKotlinPlatforms.set(setOf(KotlinPlatformType.androidJvm))
+}
+
 android {
     namespace = "com.mirego.pilot.components"
 
     buildFeatures {
         compose = true
     }
-
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.androidx.compose.compiler.get()
-    }
 }
 
 kotlin {

gradle.properties

@@ -2,7 +2,6 @@ org.gradle.configureondemand=false
 org.gradle.jvmargs=-Xmx4g
 android.enableJetifier=true
 android.useAndroidX=true
-kotlin.native.cacheKind=none
 kotlin.mpp.stability.nowarn=true
 kotlin.mpp.androidGradlePluginCompatibility.nowarn=true
-version=0.2.14-SNAPSHOT
+version=0.3.0-SNAPSHOT

gradle/libs.versions.toml

@@ -1,15 +1,15 @@
 [versions]
-kotlin = "1.9.23"
-agp = "8.4.0"
+kotlin = "2.0.0"
+agp = "8.5.0"
 ktlint = "12.1.0"
 binary-compatibility = "0.13.2"
-androidx-compose-runtime = "1.6.7"
+androidx-compose-runtime = "1.6.8"
 androidx-compose-material3 = "1.2.1"
-androidx-lifecycle = "2.7.0"
+androidx-lifecycle = "2.8.2"
 androidx-navigation = "2.7.7"
 androidx-activity-compose = "1.9.0"
-androidx-compose-compiler = "1.5.13"
-kotlinx-coroutines = "1.8.0"
+androidx-compose-compiler = "1.5.14"
+kotlinx-coroutines = "1.8.1"
 mirego-publish = "1.5"
 coil = "2.5.0"
 dokka = "1.9.20"
@@ -45,6 +45,7 @@ kotlinx-binaryCompatibilityValidator = { group = "org.jetbrains.kotlinx", name =
 android-library = { id = "com.android.library", version.ref = "agp" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 ktlint = { id = "org.jlleitschuh.gradle.ktlint", version.ref = "ktlint" }
 kotlinx-binaryCompatibilityValidator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version.ref = "binary-compatibility" }
 mirego-publish = { id = "mirego.publish", version.ref = "mirego-publish" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

navigation/common/build.gradle.kts

@@ -1,7 +1,10 @@
 @file:Suppress("DSL_SCOPE_VIOLATION")
 
+import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType
+
 plugins {
     id("buildlogic.kotlin.multiplatform")
+    alias(libs.plugins.compose.compiler)
 }
 
 group = "com.mirego.pilot"
@@ -13,16 +16,16 @@ ktlint {
     }
 }
 
+composeCompiler {
+    targetKotlinPlatforms.set(setOf(KotlinPlatformType.androidJvm))
+}
+
 android {
     namespace = "com.mirego.pilot.navigation"
 
     buildFeatures {
         compose = true
     }
-
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.androidx.compose.compiler.get()
-    }
 }
 
 kotlin {
@@ -35,13 +38,13 @@ kotlin {
         val commonTest by getting {
             dependencies {
                 implementation(libs.kotlin.test)
-                implementation(libs.kotlin.test.junit)
                 implementation(libs.kotlinx.coroutines.test)
                 implementation(libs.assertk)
             }
         }
         val androidMain by getting {
             dependencies {
+                implementation(libs.kotlin.test.junit)
                 implementation(libs.kotlin.stdlib.jdk8)
                 implementation(libs.bundles.lifecycle)
                 implementation(libs.androidx.compose.ui)