From 8cc55d073b320c9212c4d1df8889e3b6efdf272e Mon Sep 17 00:00:00 2001 From: Ferran Pons Date: Fri, 3 May 2024 12:34:20 +0200 Subject: [PATCH] Upgraded project to Kotlin 2.0.0-RC1 (#11) * added missing configurations for Fleet * removed unneeded test file * raised version * removed unneeded test and raised versions --- desktopApp/build.gradle.kts | 1 - gradle.properties | 4 +-- gradle/libs.versions.toml | 28 +++++++++---------- shared/build.gradle.kts | 2 ++ .../app/AndroidTest.kt | 11 -------- .../app/CommonTest.kt | 11 -------- 6 files changed, 18 insertions(+), 39 deletions(-) delete mode 100644 shared/src/androidUnitTest/kotlin/com/multiplatformkickstarter/app/AndroidTest.kt delete mode 100644 shared/src/commonTest/kotlin/com/multiplatformkickstarter/app/CommonTest.kt diff --git a/desktopApp/build.gradle.kts b/desktopApp/build.gradle.kts index a3361f1..0c86238 100644 --- a/desktopApp/build.gradle.kts +++ b/desktopApp/build.gradle.kts @@ -7,7 +7,6 @@ plugins { kotlin { jvm { - jvmToolchain(17) withJava() } sourceSets { diff --git a/gradle.properties b/gradle.properties index 02d7821..e86259e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -32,5 +32,5 @@ multiplatformkickstarter.android.minSdk = 26 multiplatformkickstarter.android.targetSdk = 34 multiplatformkickstarter.version.major = 1 -multiplatformkickstarter.version.minor = 2 -multiplatformkickstarter.version.patch = 1 \ No newline at end of file +multiplatformkickstarter.version.minor = 4 +multiplatformkickstarter.version.patch = 0 \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a9a7e70..91e14bd 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,25 +1,25 @@ [versions] -kotlin = "1.9.22" -ktor-client = "2.3.8" -ktor-server = "2.3.8" +kotlin = "2.0.0-RC1" +ktor-client = "2.3.10" +ktor-server = "2.3.10" multiplatform-settings = "1.0.0" voyager = "1.0.0" -koin = "3.5.3" -koin-compose = "1.1.2" +koin = "3.5.6" +koin-compose = "1.1.3" junit = "4.13.2" androidGradlePlugin = "8.2.2" -composeMultiplatform = "1.6.0" -compose-compiler = "1.5.8-dev-k1.9.22-42b6ec2b037" +composeMultiplatform = "1.6.2" +compose-compiler = "1.5.13-dev-k2.0.0-RC1-50f08dfa4b4" exposed = "0.37.3" -skiko = "0.7.93" +skiko = "0.7.97" ktlint = "11.5.1" detekt = "1.23.1" kotlinx-coroutines = "1.8.0" androidx-junit = "1.1.5" espressoCore = "3.5.1" accompanistSystemuicontroller = "0.32.0" -activityCompose = "1.8.2" -firebase = "32.7.2" +activityCompose = "1.9.0" +firebase = "33.0.0" touchlab = "2.0.5" [libraries] @@ -38,7 +38,7 @@ ktor-client = { module = "io.ktor:ktor-client-core", version.ref = "ktor-client" kamel = "media.kamel:kamel-image:0.7.1" kermit = "co.touchlab:kermit:2.0.0-RC5" -kotlinx-serialization-json = "org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.2" +kotlinx-serialization-json = "org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3" kotlinx-datetime = "org.jetbrains.kotlinx:kotlinx-datetime:0.5.0" kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" } kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinx-coroutines" } @@ -53,10 +53,10 @@ koin-core = { module = "io.insert-koin:koin-core", version.ref = "koin" } koin-test = { module = "io.insert-koin:koin-test", version.ref = "koin" } # Android -compose-bom = "androidx.compose:compose-bom:2024.02.01" +compose-bom = "androidx.compose:compose-bom:2024.05.00" koin-android = { module = "io.insert-koin:koin-android", version.ref = "koin" } -androidx-core-ktx = "androidx.core:core-ktx:1.12.0" +androidx-core-ktx = "androidx.core:core-ktx:1.13.1" androidx-core-splashscreen = "androidx.core:core-splashscreen:1.0.1" androidx-tracing-ktx = "androidx.tracing:tracing-ktx:1.2.0" accompanist-systemuicontroller = { module = "com.google.accompanist:accompanist-systemuicontroller", version.ref = "accompanistSystemuicontroller" } @@ -74,7 +74,7 @@ stately-common = { module = "co.touchlab:stately-common", version.ref = "touchla koin-compose = { module = "io.insert-koin:koin-compose", version.ref = "koin-compose" } kotlinx-coroutines-swingui = "org.jetbrains.kotlinx:kotlinx-coroutines-swing:1.8.0" ktor-client-java = { module = "io.ktor:ktor-client-java", version.ref = "ktor-client" } -androidx-compose-ui-util = "androidx.compose.ui:ui-util:1.6.2" +androidx-compose-ui-util = "androidx.compose.ui:ui-util:1.6.7" # Backend ktor-server-core = { module = "io.ktor:ktor-server-core", version.ref = "ktor-server" } diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts index e45c8c7..141afa8 100644 --- a/shared/build.gradle.kts +++ b/shared/build.gradle.kts @@ -69,6 +69,8 @@ kotlin { // Logging implementation(libs.kermit) + + implementation(libs.junit) } androidMain.dependencies { diff --git a/shared/src/androidUnitTest/kotlin/com/multiplatformkickstarter/app/AndroidTest.kt b/shared/src/androidUnitTest/kotlin/com/multiplatformkickstarter/app/AndroidTest.kt deleted file mode 100644 index d58fc0f..0000000 --- a/shared/src/androidUnitTest/kotlin/com/multiplatformkickstarter/app/AndroidTest.kt +++ /dev/null @@ -1,11 +0,0 @@ -package com.multiplatformkickstarter.app - -import org.junit.Test - -class AndroidTest { - - @Test - fun testExample() { - // assertTrue("Check Android is mentioned", Greeting().greet().contains("Android")) - } -} diff --git a/shared/src/commonTest/kotlin/com/multiplatformkickstarter/app/CommonTest.kt b/shared/src/commonTest/kotlin/com/multiplatformkickstarter/app/CommonTest.kt deleted file mode 100644 index 8d16fca..0000000 --- a/shared/src/commonTest/kotlin/com/multiplatformkickstarter/app/CommonTest.kt +++ /dev/null @@ -1,11 +0,0 @@ -package com.multiplatformkickstarter.app - -import kotlin.test.Test - -class CommonTest { - - @Test - fun testExample() { - // assertTrue(Greeting().greet().contains("Hello"), "Check 'Hello' is mentioned") - } -}