Support Kotlin 2.0.20

androidExample/build.gradle.kts

@@ -4,6 +4,7 @@ plugins {
     alias(libs.plugins.kotlin.android)
     alias(libs.plugins.ksp) apply false
     alias(libs.plugins.compose)
+    alias(libs.plugins.compose.compiler)
 }
 
 android {
@@ -48,10 +49,10 @@ android {
 
 dependencies {
     // Core
-    implementation("androidx.core:core-ktx:1.12.0")
-    implementation("androidx.appcompat:appcompat:1.6.1")
+    implementation(libs.core.ktx)
+    implementation(libs.appcompat)
     // Compose
-    implementation("androidx.activity:activity-compose:1.8.2")
+    implementation(libs.activity.compose)
     implementation(compose.runtime)
     implementation(compose.foundation)
     implementation(compose.material)

build.gradle.kts

@@ -6,8 +6,9 @@ plugins {
     kotlin("android") apply false
     id("com.android.application") apply false
     id("com.android.library") apply false
-    id("org.jetbrains.compose") apply false
+    alias(libs.plugins.compose) apply false
     id("io.github.gradle-nexus.publish-plugin") version "1.3.0"
+    alias(libs.plugins.compose.compiler) apply false
 }
 
 apply(from = "publish-root.gradle")

desktopExample/build.gradle.kts

@@ -15,6 +15,7 @@ dependencies {
     implementation(compose.components.resources)
     implementation(compose.desktop.currentOs)
     implementation(libs.kodeview)
+    alias(libs.plugins.compose.compiler)
 }
 
 compose.desktop {

gradle/libs.versions.toml

@@ -1,18 +1,25 @@
 [versions]
+activityCompose = "1.9.2"
+appcompat = "1.7.0"
+coreKtx = "1.13.1"
 jvmTarget = "1.8"
 gradlePlugin = "8.1.0"
-kotlin = "1.9.22"
+
+kotlin = "2.0.20"
 ksp = "1.8.10-1.0.9"
 kotlinCompilerExtensionVersion = "1.5.3"
-kotlinAndroid = "1.9.22"
-kotlinMultiplatform = "1.9.22"
-compose = "1.5.12"
-androidLibrary = "8.1.1"
+kotlinAndroid = "2.0.20"
+kotlinMultiplatform = "2.0.20"
+compose = "1.6.11"
+androidLibrary = "8.6.1"
 kodeview = "0.8.0"
-highlights = "0.8.0"
-composeMaterial = "1.2.1"
+highlights = "0.7.1"
+composeMaterial = "1.4.0"
 
 [libraries]
+activity-compose = { module = "androidx.activity:activity-compose", version.ref = "activityCompose" }
+appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" }
+core-ktx = { module = "androidx.core:core-ktx", version.ref = "coreKtx" }
 kodeview = { group = "dev.snipme", name = "kodeview", version.ref = "kodeview" }
 highlights = { group = "dev.snipme", name = "highlights", version.ref = "highlights" }
 compose-material = { group = "androidx.wear.compose", name = "compose-material", version.ref = "composeMaterial" }
@@ -22,6 +29,7 @@ ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
 multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlinMultiplatform" }
 jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 compose = { id = "org.jetbrains.compose", version.ref = "compose" }
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlinAndroid" }
 android-application = { id = "com.android.application" }
 android-library = { id = "com.android.library", version.ref = "androidLibrary" }

kodeview/build.gradle.kts

@@ -3,6 +3,7 @@ plugins {
     alias(libs.plugins.multiplatform)
     alias(libs.plugins.android.library)
     alias(libs.plugins.compose)
+    alias(libs.plugins.compose.compiler)
     id("maven-publish")
     id("signing")
 }

settings.gradle.kts

@@ -10,9 +10,11 @@ pluginManagement {
     }
 
     plugins {
-        val kotlinVersion = "1.9.22"
-        val agpVersion = "8.1.1"
-        val composeVersion = "1.5.12"
+
+        val kotlinVersion = "2.0.20"
+        val agpVersion = "8.6.1"
+        val composeVersion = "1.6.11"
+
 
         kotlin("jvm").version(kotlinVersion)
         kotlin("multiplatform").version(kotlinVersion)
@@ -21,6 +23,8 @@ pluginManagement {
         id("com.android.application").version(agpVersion)
         id("com.android.library").version(agpVersion)
         id("org.jetbrains.compose").version(composeVersion)
+        id("org.jetbrains.kotlin.plugin.compose").version(kotlinVersion)
+
     }
 }
 

webExample/build.gradle.kts

@@ -2,6 +2,7 @@
 plugins {
     alias(libs.plugins.multiplatform)
     alias(libs.plugins.compose)
+    alias(libs.plugins.compose.compiler)
 }
 
 kotlin {
@@ -22,8 +23,4 @@ kotlin {
             }
         }
     }
-}
-
-compose.experimental {
-    web.application {}
 }