Skip to content

Commit

Permalink
Upgraded project to Kotlin 2.0.0-RC1 (#11)
Browse files Browse the repository at this point in the history
* added missing configurations for Fleet

* removed unneeded test file

* raised version

* removed unneeded test and raised versions
  • Loading branch information
ferranpons authored May 3, 2024
1 parent 78921a9 commit 8cc55d0
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 39 deletions.
1 change: 0 additions & 1 deletion desktopApp/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ plugins {

kotlin {
jvm {
jvmToolchain(17)
withJava()
}
sourceSets {
Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@ multiplatformkickstarter.android.minSdk = 26
multiplatformkickstarter.android.targetSdk = 34

multiplatformkickstarter.version.major = 1
multiplatformkickstarter.version.minor = 2
multiplatformkickstarter.version.patch = 1
multiplatformkickstarter.version.minor = 4
multiplatformkickstarter.version.patch = 0
28 changes: 14 additions & 14 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -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]
Expand All @@ -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" }
Expand All @@ -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" }
Expand All @@ -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" }
Expand Down
2 changes: 2 additions & 0 deletions shared/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@ kotlin {

// Logging
implementation(libs.kermit)

implementation(libs.junit)
}

androidMain.dependencies {
Expand Down

This file was deleted.

This file was deleted.

0 comments on commit 8cc55d0

Please sign in to comment.