Skip to content

Commit f3e5334

Browse files
committed
build: upgrade kotlin to version 2
1 parent cdc4c04 commit f3e5334

File tree

7 files changed

+18
-41
lines changed

7 files changed

+18
-41
lines changed

app/build.gradle.kts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ plugins {
99
alias(libs.plugins.ksp)
1010
alias(libs.plugins.hilt)
1111
alias(libs.plugins.convention.android.application)
12-
alias(libs.plugins.convention.android.compose)
12+
alias(libs.plugins.kotlin.compose.compiler)
1313
}
1414

1515

@@ -64,6 +64,10 @@ android {
6464
excludes.add("META-INF/LICENSE-notice.md")
6565
}
6666
}
67+
68+
buildFeatures {
69+
compose = true
70+
}
6771
}
6872

6973
kotlin {

build-logic/convention/build.gradle.kts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,6 @@ gradlePlugin {
2424
id = "convention.android.application"
2525
implementationClass = "com.monstarlab.convention.AndroidAppConventionPlugin"
2626
}
27-
register("conventionCompose") {
28-
id = "convention.android.compose"
29-
implementationClass = "com.monstarlab.convention.ComposeConventionPlugin"
30-
}
27+
3128
}
3229
}

build-logic/convention/src/main/kotlin/com/monstarlab/convention/ComposeConventionPlugin.kt

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

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ plugins {
1515
alias(libs.plugins.kotlin.android) apply false
1616
alias(libs.plugins.convention.android.library) apply false
1717
alias(libs.plugins.convention.android.application) apply false
18-
alias(libs.plugins.convention.android.compose) apply false
1918
alias(libs.plugins.detekt) apply false
2019
alias(libs.plugins.spotless)
2120
alias(libs.plugins.hilt) apply false
2221
alias(libs.plugins.ksp) apply false
22+
alias(libs.plugins.kotlin.compose.compiler) apply false
2323
}
2424

2525
allprojects {

core/build.gradle.kts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,15 @@ plugins {
66
alias(libs.plugins.ksp)
77
alias(libs.plugins.kotlin.serialization)
88
alias(libs.plugins.convention.android.library)
9-
alias(libs.plugins.convention.android.compose)
10-
9+
alias(libs.plugins.kotlin.compose.compiler)
1110
}
1211

1312
android {
1413
namespace = "com.monstarlab.core"
14+
buildFeatures.compose = true
1515
}
1616

17+
1718
kotlin {
1819
jvmToolchain(17)
1920
}

designsystem/build.gradle.kts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@ plugins {
33
alias(libs.plugins.android.library)
44
alias(libs.plugins.kotlin.android)
55
alias(libs.plugins.convention.android.library)
6-
alias(libs.plugins.convention.android.compose)
7-
6+
alias(libs.plugins.kotlin.compose.compiler)
87
}
98

109
android {
1110
namespace = "com.monstarlab.designsystem"
11+
buildFeatures.compose = true
12+
1213
}
1314

1415
kotlin {

gradle/libs.versions.toml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
[versions]
22
nstack = "3.3.0"
3-
kotlin = "1.9.24"
4-
ksp = "1.9.24-1.0.20"
3+
kotlin = "2.0.0"
4+
ksp = "2.0.0-1.0.21"
55
kotlin_coroutines = "1.8.1"
66
retrofit = "2.11.0"
77
okhttp = "4.12.0"
88
compose_bom = "2024.05.00"
9-
compose_compiler = "1.5.14"
109
hilt = "2.51.1"
1110
lifecycle = "2.7.0"
1211
navigation = "2.7.7"
@@ -27,12 +26,14 @@ kotlin_serialization = { id = "org.jetbrains.kotlin.plugin.serialization", versi
2726
android-application = { id = "com.android.application", version.ref = "android_gradle" }
2827
android_library = { id = "com.android.library", version.ref = "android_gradle" }
2928
kotlin_android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
29+
kotlin-compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
30+
31+
3032
hilt = { id = "com.google.dagger.hilt.android", version.ref = "hilt" }
3133
ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
3234
nstack = { id = "dk.nodes.nstack.plugin", version.ref = "nstack" }
3335
convention-android-library = { id = "convention.android.library", version = "unspecified" }
3436
convention-android-application = { id = "convention.android.application", version = "unspecified" }
35-
convention-android-compose = { id = "convention.android.compose", version = "unspecified" }
3637

3738
[libraries]
3839
#-------------------------

0 commit comments

Comments
 (0)