Skip to content

Commit 8cc55d0

Browse files
authored
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
1 parent 78921a9 commit 8cc55d0

File tree

6 files changed

+18
-39
lines changed

6 files changed

+18
-39
lines changed

desktopApp/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ plugins {
77

88
kotlin {
99
jvm {
10-
jvmToolchain(17)
1110
withJava()
1211
}
1312
sourceSets {

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@ multiplatformkickstarter.android.minSdk = 26
3232
multiplatformkickstarter.android.targetSdk = 34
3333

3434
multiplatformkickstarter.version.major = 1
35-
multiplatformkickstarter.version.minor = 2
36-
multiplatformkickstarter.version.patch = 1
35+
multiplatformkickstarter.version.minor = 4
36+
multiplatformkickstarter.version.patch = 0

gradle/libs.versions.toml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
[versions]
2-
kotlin = "1.9.22"
3-
ktor-client = "2.3.8"
4-
ktor-server = "2.3.8"
2+
kotlin = "2.0.0-RC1"
3+
ktor-client = "2.3.10"
4+
ktor-server = "2.3.10"
55
multiplatform-settings = "1.0.0"
66
voyager = "1.0.0"
7-
koin = "3.5.3"
8-
koin-compose = "1.1.2"
7+
koin = "3.5.6"
8+
koin-compose = "1.1.3"
99
junit = "4.13.2"
1010
androidGradlePlugin = "8.2.2"
11-
composeMultiplatform = "1.6.0"
12-
compose-compiler = "1.5.8-dev-k1.9.22-42b6ec2b037"
11+
composeMultiplatform = "1.6.2"
12+
compose-compiler = "1.5.13-dev-k2.0.0-RC1-50f08dfa4b4"
1313
exposed = "0.37.3"
14-
skiko = "0.7.93"
14+
skiko = "0.7.97"
1515
ktlint = "11.5.1"
1616
detekt = "1.23.1"
1717
kotlinx-coroutines = "1.8.0"
1818
androidx-junit = "1.1.5"
1919
espressoCore = "3.5.1"
2020
accompanistSystemuicontroller = "0.32.0"
21-
activityCompose = "1.8.2"
22-
firebase = "32.7.2"
21+
activityCompose = "1.9.0"
22+
firebase = "33.0.0"
2323
touchlab = "2.0.5"
2424

2525
[libraries]
@@ -38,7 +38,7 @@ ktor-client = { module = "io.ktor:ktor-client-core", version.ref = "ktor-client"
3838
kamel = "media.kamel:kamel-image:0.7.1"
3939
kermit = "co.touchlab:kermit:2.0.0-RC5"
4040

41-
kotlinx-serialization-json = "org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.2"
41+
kotlinx-serialization-json = "org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3"
4242
kotlinx-datetime = "org.jetbrains.kotlinx:kotlinx-datetime:0.5.0"
4343
kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" }
4444
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" }
5353
koin-test = { module = "io.insert-koin:koin-test", version.ref = "koin" }
5454

5555
# Android
56-
compose-bom = "androidx.compose:compose-bom:2024.02.01"
56+
compose-bom = "androidx.compose:compose-bom:2024.05.00"
5757
koin-android = { module = "io.insert-koin:koin-android", version.ref = "koin" }
5858

59-
androidx-core-ktx = "androidx.core:core-ktx:1.12.0"
59+
androidx-core-ktx = "androidx.core:core-ktx:1.13.1"
6060
androidx-core-splashscreen = "androidx.core:core-splashscreen:1.0.1"
6161
androidx-tracing-ktx = "androidx.tracing:tracing-ktx:1.2.0"
6262
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
7474
koin-compose = { module = "io.insert-koin:koin-compose", version.ref = "koin-compose" }
7575
kotlinx-coroutines-swingui = "org.jetbrains.kotlinx:kotlinx-coroutines-swing:1.8.0"
7676
ktor-client-java = { module = "io.ktor:ktor-client-java", version.ref = "ktor-client" }
77-
androidx-compose-ui-util = "androidx.compose.ui:ui-util:1.6.2"
77+
androidx-compose-ui-util = "androidx.compose.ui:ui-util:1.6.7"
7878

7979
# Backend
8080
ktor-server-core = { module = "io.ktor:ktor-server-core", version.ref = "ktor-server" }

shared/build.gradle.kts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,8 @@ kotlin {
6969

7070
// Logging
7171
implementation(libs.kermit)
72+
73+
implementation(libs.junit)
7274
}
7375

7476
androidMain.dependencies {

shared/src/androidUnitTest/kotlin/com/multiplatformkickstarter/app/AndroidTest.kt

Lines changed: 0 additions & 11 deletions
This file was deleted.

shared/src/commonTest/kotlin/com/multiplatformkickstarter/app/CommonTest.kt

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)