Skip to content

Commit c3d685f

Browse files
committed
Kotlin 2.0 migrations
1 parent cc7ac63 commit c3d685f

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

Diff for: .gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
*.iml
22
.gradle
3+
.kotlin
34
/local.properties
45
/.idea/androidTestResultsUserPreferences.xml
56
/.idea/caches

Diff for: app/build.gradle.kts

+1-3
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ plugins {
1919
alias(libs.plugins.baselineprofile)
2020
alias(libs.plugins.hilt)
2121
alias(libs.plugins.kotlinAndroid)
22+
alias(libs.plugins.kotlinCompose)
2223
alias(libs.plugins.ksp)
2324
}
2425

@@ -49,9 +50,6 @@ android {
4950
buildConfig = true
5051
compose = true
5152
}
52-
composeOptions {
53-
kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
54-
}
5553
packaging {
5654
resources {
5755
excludes += "/META-INF/{AL2.0,LGPL2.1}"

Diff for: build.gradle.kts

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ plugins {
2121
alias(libs.plugins.androidTest) apply false
2222
alias(libs.plugins.baselineprofile) apply false
2323
alias(libs.plugins.kotlinAndroid) apply false
24+
alias(libs.plugins.kotlinCompose) apply false
2425
alias(libs.plugins.spotless) apply false
2526
alias(libs.plugins.hilt) apply false
2627
alias(libs.plugins.ksp) apply false

Diff for: gradle/libs.versions.toml

+3-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ graphics = "1.0.0-beta01"
3030
hilt = "2.51.1"
3131
hiltNavigationCompose = "1.2.0"
3232
junit = "4.13.2"
33-
kotlin = "1.9.23"
34-
ksp = "1.9.23-1.0.20"
33+
kotlin = "2.0.0"
34+
ksp = "2.0.0-1.0.22"
3535
lifecycle = "2.8.2"
3636
material3 = "1.2.1"
3737
media3 = "1.3.1"
@@ -113,5 +113,6 @@ androidTest = { id = "com.android.test", version.ref = "agp" }
113113
baselineprofile = { id = "androidx.baselineprofile", version.ref = "baselineprofile" }
114114
hilt = { id = "com.google.dagger.hilt.android", version.ref = "hilt" }
115115
kotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
116+
kotlinCompose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
116117
ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
117118
spotless = { id = "com.diffplug.spotless", version.ref = "spotless" }

0 commit comments

Comments
 (0)