--- a/buildSrc/build.gradle.kts	Wed Mar 12 18:42:28 2025 -0400
+++ b/buildSrc/build.gradle.kts	Wed Mar 12 19:00:20 2025 -0400
@@ -64,7 +64,7 @@
 
 dependencies {
     implementation(libs.plugins.com.android.application.gav())
-    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.20")
+    implementation(libs.plugins.org.jetbrains.kotlin.android.gav())
     implementation("gradle.plugin.com.hierynomus.gradle.plugins:license-gradle-plugin:0.16.1")
 
     implementation("com.geekorum.gradle.avdl:plugin:0.0.3")

--- a/gradle/libs.versions.toml	Wed Mar 12 18:42:28 2025 -0400
+++ b/gradle/libs.versions.toml	Wed Mar 12 19:00:20 2025 -0400
@@ -21,7 +21,7 @@
 [versions]
 com-android-application = "8.9.0"
 com-android-library = "8.9.0"
-org-jetbrains-kotlin-android = "1.8.20"
+org-jetbrains-kotlin = "2.1.10"
 junit = "4.13.2"
 androidx-test-ext-junit = "1.1.5"
 espresso-core = "3.5.1"
@@ -31,7 +31,6 @@
 androidx-activity = "1.7.0"
 androidx-navigation = "2.5.3"
 androidx-compose-bom = "2023.04.00"
-androidx-compose-compiler = "1.4.5"
 androidx-lifecycle = "2.6.1"
 geekdroid = "geekttrss-1.6.2"
 
@@ -67,7 +66,8 @@
 [plugins]
 com-android-application = { id = "com.android.application", version.ref = "com-android-application" }
 com-android-library = { id = "com.android.library", version.ref = "com-android-library" }
-org-jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "org-jetbrains-kotlin-android" }
+org-jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "org-jetbrains-kotlin" }
+org-jetbrains-kotlin-compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "org-jetbrains-kotlin" }
 google-gms-oss-license = { id = "com.google.android.gms.oss-licenses-plugin", version = "0.10.6" }
 
 [bundles]

--- a/sample/build.gradle.kts	Wed Mar 12 18:42:28 2025 -0400
+++ b/sample/build.gradle.kts	Wed Mar 12 19:00:20 2025 -0400
@@ -24,6 +24,7 @@
     id("com.android.application")
     id("org.jetbrains.kotlin.android")
     id("com.geekorum.build.source-license-checker")
+    alias(libs.plugins.org.jetbrains.kotlin.compose.compiler)
     alias(libs.plugins.google.gms.oss.license)
 }
 
@@ -71,9 +72,6 @@
         compose = true
         buildConfig = true
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.androidx.compose.compiler.get()
-    }
     packaging {
         resources {
             excludes += "/META-INF/{AL2.0,LGPL2.1}"

--- a/ui/material2/build.gradle.kts	Wed Mar 12 18:42:28 2025 -0400
+++ b/ui/material2/build.gradle.kts	Wed Mar 12 19:00:20 2025 -0400
@@ -22,6 +22,7 @@
 plugins {
     id("com.android.library")
     kotlin("android")
+    alias(libs.plugins.org.jetbrains.kotlin.compose.compiler)
     id("com.geekorum.build.source-license-checker")
     `maven-publish`
 }
@@ -65,10 +66,6 @@
         compose = true
     }
 
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.androidx.compose.compiler.get()
-    }
-
     publishing {
         singleVariant("release") {
             withJavadocJar()

--- a/ui/material3/build.gradle.kts	Wed Mar 12 18:42:28 2025 -0400
+++ b/ui/material3/build.gradle.kts	Wed Mar 12 19:00:20 2025 -0400
@@ -22,6 +22,7 @@
 plugins {
     id("com.android.library")
     kotlin("android")
+    alias(libs.plugins.org.jetbrains.kotlin.compose.compiler)
     id("com.geekorum.build.source-license-checker")
     `maven-publish`
 }
@@ -65,10 +66,6 @@
         compose = true
     }
 
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.androidx.compose.compiler.get()
-    }
-
     publishing {
         singleVariant("release") {
             withJavadocJar()