Bump kotlin version to 1.9.20

mr3y-the-programmer · Nov 7, 2023 · d6ad71e · d6ad71e
1 parent 0257dcd
commit d6ad71e
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 44 deletions.
diff --git a/desktopApp/build.gradle.kts b/desktopApp/build.gradle.kts
@@ -12,7 +12,7 @@ kotlin {
         withJava()
     }
     sourceSets {
-        val jvmMain by getting {
+        jvmMain {
             dependencies {
                 implementation(compose.desktop.currentOs)
                 implementation(compose.desktop.common)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -77,41 +77,12 @@ android-library = "com.android.library:8.1.2"
 ##                                 ⬆ :8.3.0-alpha10"
 ##                                 ⬆ :8.3.0-alpha11"
 ##                                 ⬆ :8.3.0-alpha12"
-kotlin-android = "org.jetbrains.kotlin.android:1.9.10"
-##                                         ⬆ :1.9.20-Beta"
-##                                         ⬆ :1.9.20-Beta2"
-##                                         ⬆ :1.9.20-RC"
-##                                         ⬆ :1.9.20-RC2"
-##                                         ⬆ :1.9.20"
-kotlin-jvm = "org.jetbrains.kotlin.jvm:1.9.10"
-##                                 ⬆ :1.9.20-Beta"
-##                                 ⬆ :1.9.20-Beta2"
-##                                 ⬆ :1.9.20-RC"
-##                                 ⬆ :1.9.20-RC2"
-##                                 ⬆ :1.9.20"
-kotlin-multiplatform = "org.jetbrains.kotlin.multiplatform:1.9.10"
-##                                                     ⬆ :1.9.20-Beta"
-##                                                     ⬆ :1.9.20-Beta2"
-##                                                     ⬆ :1.9.20-RC"
-##                                                     ⬆ :1.9.20-RC2"
-##                                                     ⬆ :1.9.20"
-compose-multiplatform = "org.jetbrains.compose:1.5.10-beta02"
-##                                         ⬆ :1.5.10-rc01"
-##                                         ⬆ :1.5.10-rc02"
-##                                         ⬆ :1.5.10"
-kotlin-ksp = "com.google.devtools.ksp:1.9.10-1.0.13"
-##                                ⬆ :1.9.20-Beta-1.0.13"
-##                                ⬆ :1.9.20-Beta2-1.0.13"
-##                                ⬆ :1.9.20-RC-1.0.13"
-##                                ⬆ :1.9.20-RC2-1.0.13"
-##                                ⬆ :1.9.20-1.0.13"
-##                                ⬆ :1.9.20-1.0.14"
-kotlinx-serialization = "org.jetbrains.kotlin.plugin.serialization:1.9.10"
-##                                                             ⬆ :1.9.20-Beta"
-##                                                             ⬆ :1.9.20-Beta2"
-##                                                             ⬆ :1.9.20-RC"
-##                                                             ⬆ :1.9.20-RC2"
-##                                                             ⬆ :1.9.20"
+kotlin-android = "org.jetbrains.kotlin.android:1.9.20"
+kotlin-jvm = "org.jetbrains.kotlin.jvm:1.9.20"
+kotlin-multiplatform = "org.jetbrains.kotlin.multiplatform:1.9.20"
+compose-multiplatform = "org.jetbrains.compose:1.5.10"
+kotlin-ksp = "com.google.devtools.ksp:1.9.20-1.0.14"
+kotlinx-serialization = "org.jetbrains.kotlin.plugin.serialization:1.9.20"
 wire = "com.squareup.wire:4.9.1"
 ktlint-plugin = "org.jlleitschuh.gradle.ktlint:11.6.1"
 spotless-plugin = "com.diffplug.spotless:6.22.0"
@@ -201,8 +172,7 @@ voyager-navigator = "cafe.adriel.voyager:voyager-navigator:1.0.0-rc08"
 ##                                                     ⬆ :1.0.0-rc09"
 voyager-transitions = "cafe.adriel.voyager:voyager-transitions:1.0.0-rc08"
 ##                                                         ⬆ :1.0.0-rc09"
-molecule = "app.cash.molecule:molecule-runtime:1.2.1"
-##                                         ⬆ :1.3.0"
+molecule = "app.cash.molecule:molecule-runtime:1.3.0"
 androidx-test-core = "androidx.test:core:1.5.0"
 ##                                   ⬆ :1.6.0-alpha01"
 ##                                   ⬆ :1.6.0-alpha02"

diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts
@@ -31,7 +31,7 @@ kotlin {
     }
 
     @OptIn(ExperimentalKotlinGradlePluginApi::class)
-    targetHierarchy.custom {
+    applyHierarchyTemplate {
         common {
             // A shared sourceSet for (Jvm + Android) common implementations/dependencies such as Okhttp
             group("desktopAndroid") {
@@ -43,7 +43,7 @@ kotlin {
 
     sourceSets {
         @OptIn(org.jetbrains.compose.ExperimentalComposeLibrary::class)
-        val commonMain by getting {
+        commonMain {
             dependencies {
                 // Logging
                 implementation(libs.kermit)
@@ -102,7 +102,7 @@ kotlin {
                 implementation(libs.lyricist.processor)
             }
         }
-        val commonTest by getting {
+        commonTest {
             dependencies {
                 implementation(libs.junit)
                 implementation(libs.strikt)
@@ -120,7 +120,7 @@ kotlin {
             }
         }
 
-        val androidMain by getting {
+        androidMain {
             dependencies {
                 // Database driver
                 implementation(libs.sqldelight.android)
@@ -161,7 +161,7 @@ kotlin {
 
         val desktopTest by getting {
             dependencies {
-                dependsOn(commonTest)
+                dependsOn(commonTest.get())
             }
         }
     }

diff --git a/versions.properties b/versions.properties
@@ -7,4 +7,4 @@
 #### suppress inspection "SpellCheckingInspection" for whole file
 #### suppress inspection "UnusedProperty" for whole file
 
-version.androidx.compose.compiler=1.5.3
+version.androidx.compose.compiler=1.5.4