Skip to content

Upgrade: Upgrade the KMP version, and Kotlin version #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zackyoungh wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Upgrade: Upgrade the KMP version, and Kotlin version #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion JetCoKMP/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
26 changes: 13 additions & 13 deletions JetCoKMP/composeApp/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ plugins {
alias(libs.plugins.androidApplication)
alias(libs.plugins.composeMultiplatform)
alias(libs.plugins.composeCompiler)
alias(libs.plugins.composeHotReload)
}

kotlin {
Expand All @@ -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 {
Expand All @@ -54,6 +53,7 @@ kotlin {
implementation(libs.androidx.activity.compose)
}
commonMain.dependencies {
implementation(project(":jetco"))
implementation(compose.runtime)
implementation(compose.foundation)
implementation(compose.material3)
Expand All @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions JetCoKMP/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
android.useAndroidX=true
24 changes: 11 additions & 13 deletions JetCoKMP/gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" }
Expand All @@ -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" }
Expand Down
2 changes: 1 addition & 1 deletion .../src/commonMain/kotlin/com/developerstring/jetco_kmp/components/picker/MonthYearPicker.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion ...c/commonMain/kotlin/com/developerstring/jetco_kmp/components/picker/model/PickerModels.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down