diff --git a/build.gradle.kts b/build.gradle.kts
index bafb196..681f891 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -2,6 +2,7 @@
 plugins {
     alias(libs.plugins.android.application) apply false
     alias(libs.plugins.android.library) apply false
+    alias(libs.plugins.compose.compiler) apply false
     alias(libs.plugins.dokka) apply false
     alias(libs.plugins.kotlin.android) apply false
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 868f93c..982013a 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,20 +1,18 @@
 [versions]
-agp = "8.3.1"
-androidx-activityCompose = "1.8.2"
-androidx-appcompat = "1.6.1"
-androidx-core = "1.12.0"
-androidx-lifecycle = "2.7.0"
-androidx-test-core = "1.5.0"
-androidx-test-runner = "1.5.2"
-androidx-test-rules = "1.5.0"
+agp = "8.6.0"
+androidx-activityCompose = "1.9.2"
+androidx-appcompat = "1.7.0"
+androidx-core = "1.13.1"
+androidx-lifecycle = "2.8.5"
+androidx-test-core = "1.6.1"
+androidx-test-runner = "1.6.2"
+androidx-test-rules = "1.6.1"
 conscrypt = "2.5.2"
-compose-bom = "2024.03.00"
-# https://developer.android.com/jetpack/androidx/releases/compose-kotlin
-compose-compiler = "1.5.11"
+compose-bom = "2024.09.01"
 dokka = "1.9.10"
 junit = "4.13.2"
-kotlin = "1.9.23"
-mockk = "1.13.10"
+kotlin = "2.0.20"
+mockk = "1.13.12"
 okhttp3 = "4.12.0"
 
 [libraries]
@@ -43,5 +41,6 @@ okttp3-mockwebserver = { module = "com.squareup.okhttp3:mockwebserver", version.
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }
 android-library = { id = "com.android.library", version.ref = "agp" }
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
\ No newline at end of file
diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts
index bb09000..dc08b21 100644
--- a/lib/build.gradle.kts
+++ b/lib/build.gradle.kts
@@ -1,5 +1,6 @@
 plugins {
     alias(libs.plugins.android.library)
+    alias(libs.plugins.compose.compiler)
     alias(libs.plugins.dokka)
     alias(libs.plugins.kotlin.android)
     `maven-publish`
@@ -33,10 +34,6 @@ android {
         compose = true
     }
 
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
-    }
-
     lint {
         disable += listOf("MissingTranslation", "ExtraTranslation")
     }
diff --git a/sample-app/build.gradle.kts b/sample-app/build.gradle.kts
index d0824a1..4554538 100644
--- a/sample-app/build.gradle.kts
+++ b/sample-app/build.gradle.kts
@@ -1,5 +1,6 @@
 plugins {
     alias(libs.plugins.android.application)
+    alias(libs.plugins.compose.compiler)
     alias(libs.plugins.kotlin.android)
 }
 
@@ -37,9 +38,6 @@ android {
     buildFeatures {
         compose = true
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()      // keep in sync with Kotlin version in top-level build.gradle
-    }
     packaging {
         resources {
             excludes.add("/META-INF/{AL2.0,LGPL2.1}")