--- a/buildSrc/build.gradle.kts	Mon Feb 17 19:05:08 2025 -0400
+++ b/buildSrc/build.gradle.kts	Mon Feb 17 19:10:13 2025 -0400
@@ -65,7 +65,7 @@
 
 dependencies {
     implementation(libs.plugins.android.application.gav())
-    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23")
+    implementation(libs.plugins.kotlin.android.gav())
     implementation("gradle.plugin.com.hierynomus.gradle.plugins:license-gradle-plugin:0.16.1")
     implementation("com.github.triplet.gradle:play-publisher:3.7.0")
 

--- a/geekdroid/build.gradle.kts	Mon Feb 17 19:05:08 2025 -0400
+++ b/geekdroid/build.gradle.kts	Mon Feb 17 19:10:13 2025 -0400
@@ -29,6 +29,7 @@
     id("com.geekorum.build.android-tests")
     id("com.geekorum.build.android-avdl")
     `maven-publish`
+    alias(libs.plugins.compose.compiler)
 }
 
 
@@ -58,10 +59,6 @@
         compose = true
     }
 
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.androidx.compose.compiler.get()
-    }
-
     packaging {
         resources {
             excludes += listOf("META-INF/LICENSE.md", "META-INF/LICENSE-notice.md")

--- a/gradle/libs.versions.toml	Mon Feb 17 19:05:08 2025 -0400
+++ b/gradle/libs.versions.toml	Mon Feb 17 19:10:13 2025 -0400
@@ -3,7 +3,6 @@
 annotation = "1.7.1"
 androidx-activity = "1.8.2"
 androidx-compose-bom = "2024.03.00"
-androidx-compose-compiler = "1.5.11"
 browser = "1.8.0"
 constraintlayout = "2.1.4"
 coordinatorlayout = "1.2.0"
@@ -12,6 +11,7 @@
 dagger = "2.51.1"
 firebase-bom = "32.8.0"
 fragment = "1.6.2"
+kotlin = "2.1.0"
 kotlinx-coroutines-bom = "1.8.0"
 lifecycle = "2.7.0"
 material = "1.11.0"
@@ -27,6 +27,8 @@
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "android-gradle-plugin" }
+kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 
 
 [libraries]