Skip to content

Commit 68b0b8b

Browse files
committedJun 1, 2024··
[chore] Gradle: Kotlin/Compose Compiler 2.0 migration
1 parent fe1e66c commit 68b0b8b

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed
 

‎app/build.gradle.kts

+1-3
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ plugins {
99
alias(libs.plugins.com.android.application)
1010
alias(libs.plugins.org.jetbrains.kotlin.android)
1111
alias(libs.plugins.gradle.ktlint)
12+
alias(libs.plugins.compose.compiler)
1213
}
1314

1415
android {
@@ -114,9 +115,6 @@ android {
114115
buildFeatures {
115116
compose = true
116117
}
117-
composeOptions {
118-
kotlinCompilerExtensionVersion = "1.5.14"
119-
}
120118
packaging {
121119
resources {
122120
excludes += "/META-INF/{AL2.0,LGPL2.1}"

‎build.gradle.kts

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,6 @@
22
plugins {
33
alias(libs.plugins.com.android.application) apply false
44
alias(libs.plugins.org.jetbrains.kotlin.android) apply false
5-
}
5+
alias(libs.plugins.compose.compiler) apply false
6+
7+
}

‎gradle/libs.versions.toml

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
[versions]
22
com-android-application = "8.4.1"
3-
org-jetbrains-kotlin-android = "2.0.0"
43
core-ktx = "1.13.1"
54
junit = "4.13.2"
65
androidx-test-ext-junit = "1.1.5"
@@ -9,6 +8,7 @@ lifecycle = "2.7.0"
98
activity-compose = "1.9.0"
109
compose-bom = "2024.05.00"
1110
gradle-ktlint = "12.1.1"
11+
kotlin = "2.0.0"
1212

1313
[libraries]
1414
core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "core-ktx" }
@@ -29,7 +29,8 @@ material3 = { group = "androidx.compose.material3", name = "material3" }
2929

3030
[plugins]
3131
com-android-application = { id = "com.android.application", version.ref = "com-android-application" }
32-
org-jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "org-jetbrains-kotlin-android" }
32+
compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
33+
org-jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
3334
gradle-ktlint = { id = "org.jlleitschuh.gradle.ktlint", version.ref = "gradle-ktlint" }
3435

3536
[bundles]

0 commit comments

Comments
 (0)
Please sign in to comment.