Skip to content

Commit 881d3ac

Browse files
committed
Migrate to Kotlin 2.0 and the kotlin-compose-compiler plugin
1 parent 83e7ae3 commit 881d3ac

File tree

4 files changed

+7
-10
lines changed

4 files changed

+7
-10
lines changed

build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
plugins {
22
alias(libs.plugins.kotlin.android) apply false
33
alias(libs.plugins.android.library) apply false
4+
alias(libs.plugins.kotlin.compose.compiler) apply false
45
alias(libs.plugins.kover) apply false
56
}

composed-permissions/build.gradle.kts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
plugins {
22
alias(libs.plugins.kotlin.android)
33
alias(libs.plugins.android.library)
4+
alias(libs.plugins.kotlin.compose.compiler)
45
`maven-publish`
56
}
67

@@ -40,9 +41,6 @@ android {
4041
compose = true
4142
buildConfig = false
4243
}
43-
composeOptions {
44-
kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
45-
}
4644
publishing {
4745
singleVariant("release") {
4846
withSourcesJar()

composed/build.gradle.kts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ plugins {
22
alias(libs.plugins.kotlin.android)
33
alias(libs.plugins.android.library)
44
alias(libs.plugins.kover)
5+
alias(libs.plugins.kotlin.compose.compiler)
56
`maven-publish`
67
}
78

@@ -37,9 +38,6 @@ android {
3738
compose = true
3839
buildConfig = false
3940
}
40-
composeOptions {
41-
kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
42-
}
4341
packaging {
4442
resources {
4543
excludes += "/META-INF/{AL2.0,LGPL2.1}"

gradle/libs.versions.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,14 @@
22
minSdk = "21"
33
compileSdk = "34"
44

5-
kotlin = "1.9.23"
6-
agp = "8.3.2"
5+
kotlin = "2.0.0"
6+
agp = "8.4.1"
77
kover = "0.7.6"
88

9-
compose-compiler = "1.5.11"
109
compose-ui = "1.6.7"
1110
compose-material3 = "1.2.1"
1211
androidx-core-ktx = "1.13.1"
13-
androidx-annotation = "1.7.1"
12+
androidx-annotation = "1.8.0"
1413
google-accompanist-permissions = "0.34.0"
1514
compose-lint-checks = "1.3.1"
1615
junit = "4.13.2"
@@ -35,3 +34,4 @@ roboelectric = { module = "org.robolectric:robolectric", version.ref = "robolect
3534
android-library = { id = "com.android.library", version.ref = "agp" }
3635
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
3736
kover = { id = "org.jetbrains.kotlinx.kover", version.ref = "kover" }
37+
kotlin-compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }

0 commit comments

Comments
 (0)