From 67b6f64a875da94a5f7964580b7eb42e53f44bca Mon Sep 17 00:00:00 2001 From: ZackYoung Date: Wed, 13 May 2026 17:33:14 +0800 Subject: [PATCH] Upgrade: Upgrade the KMP version, and Kotlin version --- JetCoKMP/build.gradle.kts | 1 - JetCoKMP/composeApp/build.gradle.kts | 26 +++++++++---------- JetCoKMP/gradle.properties | 1 + JetCoKMP/gradle/libs.versions.toml | 24 ++++++++--------- .../components/picker/MonthYearPicker.kt | 2 +- .../components/picker/model/PickerModels.kt | 2 +- 6 files changed, 27 insertions(+), 29 deletions(-) diff --git a/JetCoKMP/build.gradle.kts b/JetCoKMP/build.gradle.kts index 98ddb8c..cf780d5 100644 --- a/JetCoKMP/build.gradle.kts +++ b/JetCoKMP/build.gradle.kts @@ -3,7 +3,6 @@ plugins { // in each subproject's classloader alias(libs.plugins.androidApplication) apply false alias(libs.plugins.androidLibrary) apply false - alias(libs.plugins.composeHotReload) apply false alias(libs.plugins.composeMultiplatform) apply false alias(libs.plugins.composeCompiler) apply false alias(libs.plugins.kotlinMultiplatform) apply false diff --git a/JetCoKMP/composeApp/build.gradle.kts b/JetCoKMP/composeApp/build.gradle.kts index f67dda9..0833293 100644 --- a/JetCoKMP/composeApp/build.gradle.kts +++ b/JetCoKMP/composeApp/build.gradle.kts @@ -7,7 +7,6 @@ plugins { alias(libs.plugins.androidApplication) alias(libs.plugins.composeMultiplatform) alias(libs.plugins.composeCompiler) - alias(libs.plugins.composeHotReload) } kotlin { @@ -21,16 +20,16 @@ kotlin { browser() binaries.executable() } - - listOf( - iosArm64(), - iosSimulatorArm64() - ).forEach { iosTarget -> - iosTarget.binaries.framework { - baseName = "ComposeApp" - isStatic = true - } - } + + listOf( + iosArm64(), + iosSimulatorArm64() + ).forEach { iosTarget -> + iosTarget.binaries.framework { + baseName = "ComposeApp" + isStatic = true + } + } jvm { compilerOptions { @@ -54,6 +53,7 @@ kotlin { implementation(libs.androidx.activity.compose) } commonMain.dependencies { + implementation(project(":jetco")) implementation(compose.runtime) implementation(compose.foundation) implementation(compose.material3) @@ -62,8 +62,8 @@ kotlin { implementation(compose.components.uiToolingPreview) implementation(libs.androidx.lifecycle.viewmodelCompose) implementation(libs.androidx.lifecycle.runtimeCompose) - implementation("org.jetbrains.compose.material:material-icons-extended:1.7.3") - implementation(project(":jetco")) + implementation(libs.material.icons.extended) + // implementation(libs.ui) } commonTest.dependencies { diff --git a/JetCoKMP/gradle.properties b/JetCoKMP/gradle.properties index e69de29..2d8d1e4 100644 --- a/JetCoKMP/gradle.properties +++ b/JetCoKMP/gradle.properties @@ -0,0 +1 @@ +android.useAndroidX=true \ No newline at end of file diff --git a/JetCoKMP/gradle/libs.versions.toml b/JetCoKMP/gradle/libs.versions.toml index 4741677..46546d6 100644 --- a/JetCoKMP/gradle/libs.versions.toml +++ b/JetCoKMP/gradle/libs.versions.toml @@ -1,24 +1,23 @@ [versions] -agp = "8.11.2" -android-compileSdk = "36" +agp = "8.13.2" +android-compileSdk = "37" android-minSdk = "24" -android-targetSdk = "36" -androidx-activity = "1.11.0" +android-targetSdk = "37" +androidx-activity = "1.13.0" androidx-appcompat = "1.7.1" -androidx-core = "1.17.0" +androidx-core = "1.18.0" androidx-espresso = "3.7.0" -androidx-lifecycle = "2.9.4" +androidx-lifecycle = "2.10.0" androidx-testExt = "1.3.0" -composeHotReload = "1.0.0-beta07" -composeMultiplatform = "1.9.0" +composeMultiplatform = "1.10.3" junit = "4.13.2" -kotlin = "2.2.20" -kotlinx-coroutines = "1.10.2" -kotlinx-datetime = "0.6.2" +kotlin = "2.3.21" +kotlinx-coroutines = "1.11.0" +kotlinx-datetime = "0.8.0" materialIconsExtended = "1.7.3" ui = "1.0.0-beta.8" -vanniktechMavenPublish = "0.34.0" +vanniktechMavenPublish = "0.36.0" [libraries] kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" } @@ -39,7 +38,6 @@ ui = { module = "com.developerstring.jetco-kmp:ui", version.ref = "ui" } [plugins] androidApplication = { id = "com.android.application", version.ref = "agp" } androidLibrary = { id = "com.android.library", version.ref = "agp" } -composeHotReload = { id = "org.jetbrains.compose.hot-reload", version.ref = "composeHotReload" } composeMultiplatform = { id = "org.jetbrains.compose", version.ref = "composeMultiplatform" } composeCompiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" } diff --git a/JetCoKMP/jetco/src/commonMain/kotlin/com/developerstring/jetco_kmp/components/picker/MonthYearPicker.kt b/JetCoKMP/jetco/src/commonMain/kotlin/com/developerstring/jetco_kmp/components/picker/MonthYearPicker.kt index 0ef9fc9..25a0aa2 100644 --- a/JetCoKMP/jetco/src/commonMain/kotlin/com/developerstring/jetco_kmp/components/picker/MonthYearPicker.kt +++ b/JetCoKMP/jetco/src/commonMain/kotlin/com/developerstring/jetco_kmp/components/picker/MonthYearPicker.kt @@ -39,7 +39,7 @@ import com.developerstring.jetco_kmp.components.picker.config.PickerDefaults import com.developerstring.jetco_kmp.components.picker.config.PickerHeaderConfig import com.developerstring.jetco_kmp.components.picker.config.WheelPickerConfig import com.developerstring.jetco_kmp.components.picker.model.PickerDisplayMode -import kotlinx.datetime.Clock +import kotlin.time.Clock import kotlinx.datetime.TimeZone import kotlinx.datetime.toLocalDateTime diff --git a/JetCoKMP/jetco/src/commonMain/kotlin/com/developerstring/jetco_kmp/components/picker/model/PickerModels.kt b/JetCoKMP/jetco/src/commonMain/kotlin/com/developerstring/jetco_kmp/components/picker/model/PickerModels.kt index 0fcecb3..fb679a5 100644 --- a/JetCoKMP/jetco/src/commonMain/kotlin/com/developerstring/jetco_kmp/components/picker/model/PickerModels.kt +++ b/JetCoKMP/jetco/src/commonMain/kotlin/com/developerstring/jetco_kmp/components/picker/model/PickerModels.kt @@ -17,7 +17,7 @@ package com.developerstring.jetco_kmp.components.picker.model import androidx.compose.runtime.Stable -import kotlinx.datetime.Clock +import kotlin.time.Clock import kotlinx.datetime.TimeZone import kotlinx.datetime.toLocalDateTime