Skip to content

Commit b528298

Browse files
committed
Migrate to new Kotlin Compose compiler plugin
1 parent 1093a94 commit b528298

3 files changed

Lines changed: 5 additions & 11 deletions

File tree

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ androidx-lifecycle = "2.7.0"
66

77
# Sample versions
88
androidx-compose = "2023.10.01"
9-
androidx-compose-compiler = "1.5.11-dev-k2.0.0-Beta4-21f5e479a96"
109
androidx-fragment = "1.6.2"
1110
ksp = "2.0.0-RC2-1.0.20"
1211
nativecoroutines = "1.0.0-ALPHA-28-kotlin-2.0.0-RC2"
@@ -32,6 +31,7 @@ android-library = { id = "com.android.library", version.ref = "android" }
3231

3332
# Sample plugins
3433
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
34+
compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
3535
android-application = { id = "com.android.application", version.ref = "android" }
3636
ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
3737
nativecoroutines = { id = "com.rickclephas.kmp.nativecoroutines", version.ref = "nativecoroutines" }

sample/androidApp/build.gradle.kts

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ plugins {
33
alias(libs.plugins.android.application)
44
@Suppress("DSL_SCOPE_VIOLATION")
55
alias(libs.plugins.kotlin.android)
6+
@Suppress("DSL_SCOPE_VIOLATION")
7+
alias(libs.plugins.compose.compiler)
68
}
79

810
android {
@@ -18,9 +20,6 @@ android {
1820
buildFeatures {
1921
compose = true
2022
}
21-
composeOptions {
22-
kotlinCompilerExtensionVersion = libs.versions.androidx.compose.compiler.get()
23-
}
2423
packagingOptions {
2524
resources {
2625
excludes += "/META-INF/{AL2.0,LGPL2.1}"
@@ -42,13 +41,6 @@ kotlin {
4241
jvmToolchain(11)
4342
}
4443

45-
// Ignore Compose Kotlin version compatibility check
46-
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile::class.java).configureEach {
47-
compilerOptions {
48-
freeCompilerArgs.addAll("-P", "plugin:androidx.compose.compiler.plugins.kotlin:suppressKotlinVersionCompatibilityCheck=true")
49-
}
50-
}
51-
5244
dependencies {
5345
implementation(project(":shared"))
5446
implementation(platform(libs.androidx.compose.bom))

sample/build.gradle.kts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ plugins {
77
alias(libs.plugins.kotlin.android) apply false
88
@Suppress("DSL_SCOPE_VIOLATION")
99
alias(libs.plugins.kotlin.multiplatform) apply false
10+
@Suppress("DSL_SCOPE_VIOLATION")
11+
alias(libs.plugins.compose.compiler) apply false
1012
}
1113

1214
buildscript {

0 commit comments

Comments
 (0)