Merge pull request #268 from joreilly/kotlin_1_9_20

Kotlin 1.9.20
joreilly · Oct 31, 2023 · b2270bb · b2270bb
2 parents 49a29be + a0d265b
commit b2270bb
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 17 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -35,10 +35,9 @@ allprojects {
 
             eachDependency {
                 if (requested.module.name.startsWith("kotlin-stdlib")) {
-                    useVersion("1.9.20-RC")
+                    useVersion("1.9.20")
                 }
             }
         }
     }
 }
-
diff --git a/compose-desktop/build.gradle.kts b/compose-desktop/build.gradle.kts
@@ -23,5 +23,5 @@ application {
 
 compose {
     kotlinCompilerPlugin.set(libs.versions.jbComposeCompiler)
-    kotlinCompilerPluginArgs.add("suppressKotlinVersionCompatibilityCheck=1.9.20-RC")
+    kotlinCompilerPluginArgs.add("suppressKotlinVersionCompatibilityCheck=1.9.20")
 }
diff --git a/compose-ios/build.gradle.kts b/compose-ios/build.gradle.kts
@@ -143,5 +143,5 @@ sqldelight {
 
 compose {
     kotlinCompilerPlugin.set(libs.versions.jbComposeCompiler)
-    kotlinCompilerPluginArgs.add("suppressKotlinVersionCompatibilityCheck=1.9.10")
+    kotlinCompilerPluginArgs.add("suppressKotlinVersionCompatibilityCheck=1.9.20")
 }
diff --git a/compose-web-wasm/build.gradle.kts b/compose-web-wasm/build.gradle.kts
@@ -61,6 +61,6 @@ compose.experimental {
 }
 
 compose {
-    kotlinCompilerPlugin.set("1.5.2.1-rc01")
-    kotlinCompilerPluginArgs.add("suppressKotlinVersionCompatibilityCheck=1.9.20-RC")
+    kotlinCompilerPlugin.set("1.5.3")
+    kotlinCompilerPluginArgs.add("suppressKotlinVersionCompatibilityCheck=1.9.20")
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,31 +1,31 @@
 [versions]
-kotlin = "1.9.20-RC"
-ksp = "1.9.20-RC-1.0.13"
+kotlin = "1.9.20"
+ksp = "1.9.20-1.0.13"
 coroutines = "1.7.3"
 kotlinxSerialization = "1.6.0"
 kotlinxDateTime = "0.4.1"
 androidGradlePlugin = "8.1.2"
 koin = "3.4.3"
-koinCompose = "3.4.6"
+koinCompose = "3.5.0"
 ktor = "2.3.5"
 slf4j = "2.0.9"
 sqlDelight = "2.0.0"
 kmpNativeCoroutines = "1.0.0-ALPHA-18"
 
 androidxActivity = "1.8.0"
-androidxComposeCompiler = "1.5.4-dev-k1.9.20-RC-1edce5fd625"
-jbComposeCompiler = "1.5.2.1-rc01"
-androidxComposeBom = "2023.10.00"
+androidxComposeCompiler = "1.5.4-dev-k1.9.20-50f08dfa4b4"
+jbComposeCompiler = "1.5.3"
+androidxComposeBom = "2023.10.01"
 androidxNavigationCompose = "2.7.4"
 androidxLifecycle = "2.6.2"
-imageLoader = "1.6.7"
+imageLoader = "1.6.8"
 
-composeMultiplatform = "1.5.1"
+composeMultiplatform = "1.5.10"
 accompanist = "0.32.0"
-coilCompose = "2.4.0"
+coilCompose = "2.5.0"
 junit = "4.13.2"
 
-multiplatformSettings = "1.0.0"
+multiplatformSettings = "1.1.0"
 kermit = "2.0.2"
 
 gradleVersionsPlugin = "0.39.0"

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -27,7 +27,7 @@ include(":app")
 include(":common")
 include(":compose-desktop")
 //include(":compose-web")
-include(":compose-web-wasm")
+//include(":compose-web-wasm")
 include(":compose-ios")
 include(":wearApp")
 include(":wearApp-benchmark")