Skip to content

Commit d824ba7

Browse files
committed
chore: upgrade dependencies
1 parent 9f6d919 commit d824ba7

File tree

6 files changed

+325
-307
lines changed

6 files changed

+325
-307
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
*.iml
22
.gradle
33
**/build/
4+
.kotlin/
45
xcuserdata
56
!src/**/build/
67
local.properties

build.gradle.kts

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

composeApp/build.gradle.kts

+3-10
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
1-
import org.jetbrains.compose.ExperimentalComposeLibrary
2-
import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
3-
41
plugins {
52
alias(libs.plugins.kotlinMultiplatform)
63
alias(libs.plugins.androidApplication)
74
alias(libs.plugins.jetbrainsCompose)
5+
alias(libs.plugins.compose.compiler)
86
}
97

108
kotlin {
11-
@OptIn(ExperimentalWasmDsl::class)
9+
@OptIn(org.jetbrains.kotlin.gradle.ExperimentalWasmDsl::class)
1210
wasmJs {
1311
moduleName = "composeApp"
1412
browser {
@@ -18,7 +16,7 @@ kotlin {
1816
}
1917
binaries.executable()
2018
}
21-
19+
2220
androidTarget {
2321
compilations.all {
2422
kotlinOptions {
@@ -90,9 +88,4 @@ android {
9088
dependencies {
9189
debugImplementation(libs.compose.ui.tooling)
9290
}
93-
}
94-
95-
96-
compose.experimental {
97-
web.application {}
9891
}

composeApp/src/commonMain/kotlin/components/FilterChip.kt

-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package components
33
import androidx.compose.foundation.layout.size
44
import androidx.compose.material.icons.Icons
55
import androidx.compose.material.icons.filled.Done
6-
import androidx.compose.material3.ExperimentalMaterial3Api
76
import androidx.compose.material3.FilterChip
87
import androidx.compose.material3.FilterChipDefaults
98
import androidx.compose.material3.Icon
@@ -15,7 +14,6 @@ import androidx.compose.runtime.remember
1514
import androidx.compose.runtime.setValue
1615
import androidx.compose.ui.Modifier
1716

18-
@OptIn(ExperimentalMaterial3Api::class)
1917
@Composable
2018
fun FilterChipExample() {
2119
var selected by remember { mutableStateOf(false) }

gradle/libs.versions.toml

+15-14
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@ agp = "8.2.2"
33
android-compileSdk = "34"
44
android-minSdk = "24"
55
android-targetSdk = "34"
6-
androidx-activityCompose = "1.9.0"
7-
androidx-appcompat = "1.6.1"
8-
androidx-constraintlayout = "2.1.4"
9-
androidx-core-ktx = "1.13.0"
10-
androidx-espresso-core = "3.5.1"
11-
androidx-material = "1.11.0"
12-
androidx-test-junit = "1.1.5"
13-
compose = "1.6.10-beta02"
14-
compose-ui-tooling = "1.6.6"
6+
androidx-activityCompose = "1.9.3"
7+
androidx-appcompat = "1.7.0"
8+
androidx-constraintlayout = "2.2.0"
9+
androidx-core-ktx = "1.15.0"
10+
androidx-espresso-core = "3.6.1"
11+
androidx-material = "1.12.0"
12+
androidx-test-junit = "1.2.1"
13+
compose = "1.7.0"
14+
compose-ui = "1.7.5"
1515
junit = "4.13.2"
16-
kotlin = "1.9.21"
16+
kotlin = "2.0.20"
1717

1818
[libraries]
1919
kodein-emoji = { module = "org.kodein.emoji:emoji-kt", version = "1.3.0" }
@@ -28,13 +28,14 @@ androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version
2828
androidx-material = { group = "com.google.android.material", name = "material", version.ref = "androidx-material" }
2929
androidx-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "androidx-constraintlayout" }
3030
androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activityCompose" }
31-
compose-ui = { module = "androidx.compose.ui:ui", version.ref = "compose" }
32-
compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "compose-ui-tooling" }
33-
compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "compose-ui-tooling" }
31+
compose-ui = { module = "androidx.compose.ui:ui", version.ref = "compose-ui" }
32+
compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "compose-ui" }
33+
compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "compose-ui" }
3434
compose-navigation = { module = "org.jetbrains.androidx.navigation:navigation-compose", version = "2.8.0-alpha01" }
3535

3636
[plugins]
3737
androidApplication = { id = "com.android.application", version.ref = "agp" }
3838
androidLibrary = { id = "com.android.library", version.ref = "agp" }
3939
jetbrainsCompose = { id = "org.jetbrains.compose", version.ref = "compose" }
40-
kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
40+
kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
41+
compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }

0 commit comments

Comments
 (0)