Merge pull request #468 from android/renovate/main-kotlin-dependencies

Update Kotlin Dependencies (main)
android · Jun 24, 2024 · bce949a · bce949a
2 parents b4625db + 0eab732
commit bce949a
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 92 deletions.
diff --git a/AdaptiveUiCodelab/app/build.gradle b/AdaptiveUiCodelab/app/build.gradle
diff --git a/AdaptiveUiCodelab/app/build.gradle.kts b/AdaptiveUiCodelab/app/build.gradle.kts
@@ -17,6 +17,7 @@
 plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.compose.compiler)
 }
 
 android {
@@ -55,9 +56,6 @@ android {
     buildFeatures {
         compose = true
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion = "1.5.13"
-    }
     packaging {
         resources {
             excludes += "/META-INF/AL2.0"

diff --git a/AdaptiveUiCodelab/build.gradle.kts b/AdaptiveUiCodelab/build.gradle.kts
@@ -23,4 +23,5 @@ buildscript {
 plugins {
     alias(libs.plugins.android.application) apply false
     alias(libs.plugins.kotlin.android) apply false
+    alias(libs.plugins.compose.compiler) apply false
 }
diff --git a/AdaptiveUiCodelab/gradle/libs.versions.toml b/AdaptiveUiCodelab/gradle/libs.versions.toml
@@ -6,8 +6,8 @@ activityCompose = "1.9.0"
 espressoCore = "3.5.1"
 junit = "4.13.2"
 junitVersion = "1.1.5"
-kotlin = "1.9.23"
-kotlinxCoroutinesAndroid = "1.8.0"
+kotlin = "2.0.0"
+kotlinxCoroutinesAndroid = "1.8.1"
 lifecycle = "2.8.2"
 window = "1.3.0"
 
@@ -33,3 +33,4 @@ kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutine
 [plugins]
 android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }