Skip to content

Commit b3d8834

Browse files
committed
Update compose
1 parent 0a63d7f commit b3d8834

File tree

3 files changed

+5
-21
lines changed

3 files changed

+5
-21
lines changed

composeApp/build.gradle.kts

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import org.jetbrains.compose.desktop.application.dsl.TargetFormat
2+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
23

34
plugins {
45
alias(libs.plugins.multiplatform)
@@ -8,13 +9,7 @@ plugins {
89
}
910

1011
kotlin {
11-
androidTarget {
12-
compilations.all {
13-
kotlinOptions {
14-
jvmTarget = "17"
15-
}
16-
}
17-
}
12+
androidTarget()
1813

1914
jvm()
2015

@@ -93,12 +88,7 @@ android {
9388
sourceCompatibility = JavaVersion.VERSION_17
9489
targetCompatibility = JavaVersion.VERSION_17
9590
}
96-
buildFeatures {
97-
compose = true
98-
}
99-
composeOptions {
100-
kotlinCompilerExtensionVersion = "1.5.10"
101-
}
91+
buildFeatures.compose = true
10292
}
10393

10494
compose.desktop {
@@ -112,7 +102,3 @@ compose.desktop {
112102
}
113103
}
114104
}
115-
116-
compose.experimental {
117-
web.application {}
118-
}

gradle.properties

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@ kotlin.code.style=official
99
kotlin.js.compiler=ir
1010

1111
#Compose
12-
org.jetbrains.compose.experimental.uikit.enabled=true
1312
org.jetbrains.compose.experimental.jscanvas.enabled=true
14-
org.jetbrains.compose.experimental.wasm.enabled=true
1513

1614
#Android
1715
android.useAndroidX=true

gradle/libs.versions.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
kotlin = "2.0.0"
44
agp = "8.2.2"
5-
compose = "1.6.10"
6-
androidx-activityCompose = "1.8.2"
5+
compose = "1.6.11"
6+
androidx-activityCompose = "1.9.0"
77
materialKolor = "1.5.1"
88

99
[libraries]

0 commit comments

Comments
 (0)