Skip to content

Commit 74114b4

Browse files
authored
Merge pull request #470 from android/renovate/end-kotlin-dependencies
Update Kotlin Dependencies (end)
2 parents ae425bb + c1a3833 commit 74114b4

File tree

4 files changed

+7
-95
lines changed

4 files changed

+7
-95
lines changed

AdaptiveUiCodelab/app/build.gradle

Lines changed: 0 additions & 88 deletions
This file was deleted.

AdaptiveUiCodelab/app/build.gradle.kts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
plugins {
1818
alias(libs.plugins.android.application)
1919
alias(libs.plugins.kotlin.android)
20+
alias(libs.plugins.compose.compiler)
2021
}
2122

2223
android {
@@ -55,9 +56,6 @@ android {
5556
buildFeatures {
5657
compose = true
5758
}
58-
composeOptions {
59-
kotlinCompilerExtensionVersion = "1.5.13"
60-
}
6159
packaging {
6260
resources {
6361
excludes += "/META-INF/AL2.0"

AdaptiveUiCodelab/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,5 @@ buildscript {
2424
plugins {
2525
alias(libs.plugins.android.application) apply false
2626
alias(libs.plugins.kotlin.android) apply false
27+
alias(libs.plugins.compose.compiler) apply false
2728
}

AdaptiveUiCodelab/gradle/libs.versions.toml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ activityCompose = "1.9.0"
66
espressoCore = "3.5.1"
77
junit = "4.13.2"
88
junitVersion = "1.1.5"
9-
kotlin = "1.9.23"
10-
kotlinxCoroutinesAndroid = "1.8.0"
11-
lifecycle = "2.7.0"
9+
kotlin = "2.0.0"
10+
kotlinxCoroutinesAndroid = "1.8.1"
11+
lifecycle = "2.8.2"
1212
material3Adaptive = "1.0.0-beta01"
1313
material3AdaptiveNavSuite = "1.3.0-beta01"
14-
window = "1.2.0"
14+
window = "1.3.0"
1515

1616
[libraries]
1717
androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "activityCompose" }
@@ -39,3 +39,4 @@ kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutine
3939
[plugins]
4040
android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }
4141
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
42+
compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }

0 commit comments

Comments
 (0)