Skip to content

Commit adc3fc3

Browse files
committed
Upgrade Kotlin 2.0.0
1 parent 7819add commit adc3fc3

File tree

6 files changed

+532
-293
lines changed

6 files changed

+532
-293
lines changed

build.gradle.kts

+1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@ plugins {
55
alias(libs.plugins.androidApplication) apply false
66
alias(libs.plugins.androidLibrary) apply false
77
alias(libs.plugins.kotlinMultiplatform) apply false
8+
alias(libs.plugins.pluginCompose) apply false
89
}

composeApp/build.gradle.kts

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ plugins {
77
alias(libs.plugins.kotlinMultiplatform)
88
alias(libs.plugins.androidApplication)
99
alias(libs.plugins.jetbrainsCompose)
10+
alias(libs.plugins.pluginCompose)
1011
}
1112

1213
kotlin {

composeApp/src/commonMain/kotlin/App.kt

+3-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ import androidx.compose.runtime.remember
1212
import androidx.compose.runtime.setValue
1313
import androidx.compose.ui.Alignment
1414
import androidx.compose.ui.Modifier
15+
import compose_example.composeapp.generated.resources.Res
16+
import compose_example.composeapp.generated.resources.compose_multiplatform
1517
import org.jetbrains.compose.resources.ExperimentalResourceApi
1618
import org.jetbrains.compose.resources.painterResource
1719

@@ -30,7 +32,7 @@ fun App() {
3032
}
3133
AnimatedVisibility(showImage) {
3234
Image(
33-
painterResource("compose-multiplatform.xml"),
35+
painterResource(Res.drawable.compose_multiplatform),
3436
null
3537
)
3638
}

gradle/libs.versions.toml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
[versions]
22
compose = "1.5.4"
3-
compose-plugin = "1.6.0-alpha01"
4-
compose-compiler = "1.5.4"
3+
compose-plugin = "1.6.10"
54
agp = "8.1.4"
65
android-minSdk = "24"
76
android-compileSdk = "34"
@@ -13,7 +12,7 @@ androidx-material = "1.10.0"
1312
androidx-constraintlayout = "2.1.4"
1413
androidx-test-junit = "1.1.5"
1514
androidx-espresso-core = "3.5.1"
16-
kotlin = "1.9.21"
15+
kotlin = "2.0.0"
1716
junit = "4.13.2"
1817

1918
[libraries]
@@ -37,4 +36,5 @@ androidx-activity-compose = { module = "androidx.activity:activity-compose", ver
3736
jetbrainsCompose = { id = "org.jetbrains.compose", version.ref = "compose-plugin" }
3837
androidApplication = { id = "com.android.application", version.ref = "agp" }
3938
androidLibrary = { id = "com.android.library", version.ref = "agp" }
40-
kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
39+
kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
40+
pluginCompose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }

0 commit comments

Comments
 (0)