Update to Kotlin 1.9.20

russhwolf · Nov 14, 2023 · ec5449c · ec5449c
1 parent 4df8b17
commit ec5449c
Show file tree

Hide file tree

Showing 13 changed files with 15 additions and 10 deletions.
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -15,7 +15,7 @@
  */
 
 plugins {
-    kotlin("jvm") version "1.9.10"
+    kotlin("jvm") version "1.9.20"
 }
 
 repositories {

diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
@@ -31,7 +31,7 @@ object Versions {
     const val coroutines = "1.7.3"
     const val junit = "4.13.2"
     const val robolectric = "4.10.3"
-    const val serializationPlugin = "1.9.10"
+    const val serializationPlugin = "1.9.20"
     const val serializationRuntime = "1.6.0"
     const val turbine = "1.0.0"
 }
diff --git a/multiplatform-settings-no-arg/build.gradle.kts b/multiplatform-settings-no-arg/build.gradle.kts
@@ -40,7 +40,7 @@ standardConfiguration(
     "tvosArm64",
     "tvosSimulatorArm64",
     "tvosX64",
-    "wasm",
+    "wasmJs",
     "watchosArm32",
     "watchosArm64",
     "watchosDeviceArm64",

diff --git a/...sshwolf/settings/BrowserNoArgTest.wasm.kt → ...sshwolf/settings/BrowserNoArgTest.wasm.kt b/...sshwolf/settings/BrowserNoArgTest.wasm.kt → ...sshwolf/settings/BrowserNoArgTest.wasm.kt
diff --git a/...usshwolf/settings/StorageSettings.wasm.kt → ...usshwolf/settings/StorageSettings.wasm.kt b/...usshwolf/settings/StorageSettings.wasm.kt → ...usshwolf/settings/StorageSettings.wasm.kt
diff --git a/sample/app-android/build.gradle.kts b/sample/app-android/build.gradle.kts
@@ -51,7 +51,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion = "1.5.3"
+        kotlinCompilerExtensionVersion = "1.5.4"
     }
 }
 

diff --git a/sample/app-desktop/build.gradle.kts b/sample/app-desktop/build.gradle.kts
@@ -29,6 +29,10 @@ dependencies {
     testImplementation(compose.desktop.uiTestJUnit4)
 }
 
+compose {
+    kotlinCompilerPlugin.set("1.5.2.1")
+}
+
 compose.desktop {
     application {
         mainClass = "com.russhwolf.settings.example.jvm.MainKt"

diff --git a/sample/app-wasm-js/build.gradle.kts b/sample/app-wasm-js/build.gradle.kts
@@ -18,12 +18,11 @@ import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
 
 plugins {
     kotlin("multiplatform")
-    id("org.jetbrains.compose") version "1.5.2"
 }
 
 kotlin {
     @OptIn(ExperimentalWasmDsl::class)
-    wasm {
+    wasmJs {
         browser {
             runTask {
                 mainOutputFileName = "settings-demo.js"
@@ -33,7 +32,7 @@ kotlin {
     }
 
     sourceSets {
-        val wasmMain by getting {
+        val wasmJsMain by getting {
             dependencies {
                 implementation(project(":shared"))
                 implementation("com.russhwolf:multiplatform-settings:${rootProject.ext["library_version"]}")

diff --git a/...-wasm-js/src/wasmMain/kotlin/MicroHtml.kt → ...asm-js/src/wasmJsMain/kotlin/MicroHtml.kt b/...-wasm-js/src/wasmMain/kotlin/MicroHtml.kt → ...asm-js/src/wasmJsMain/kotlin/MicroHtml.kt
diff --git a/...asm-js/src/wasmMain/kotlin/WasmBrowser.kt → ...m-js/src/wasmJsMain/kotlin/WasmBrowser.kt b/...asm-js/src/wasmMain/kotlin/WasmBrowser.kt → ...m-js/src/wasmJsMain/kotlin/WasmBrowser.kt
diff --git a/...wasm-js/src/wasmMain/resources/index.html → ...sm-js/src/wasmJsMain/resources/index.html b/...wasm-js/src/wasmMain/resources/index.html → ...sm-js/src/wasmJsMain/resources/index.html
diff --git a/sample/build.gradle.kts b/sample/build.gradle.kts
@@ -15,8 +15,8 @@
  */
 
 plugins {
-    kotlin("multiplatform") version "1.9.10" apply false
-    kotlin("android") version "1.9.10" apply false
+    kotlin("multiplatform") version "1.9.20" apply false
+    kotlin("android") version "1.9.20" apply false
     id("com.android.library") version "8.1.2" apply false
     id("com.android.application") version "8.1.2" apply false
 }
@@ -28,5 +28,7 @@ allprojects {
         mavenLocal()
         google()
         mavenCentral()
+        maven(url = "https://androidx.dev/storage/compose-compiler/repository/")
+        maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
     }
 }
diff --git a/sample/shared/build.gradle.kts b/sample/shared/build.gradle.kts
@@ -30,7 +30,7 @@ kotlin {
         browser()
     }
     @OptIn(ExperimentalWasmDsl::class)
-    wasm {
+    wasmJs {
         browser()
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -51,7 +51,7 @@ android { @@
         }
         composeOptions {
-            kotlinCompilerExtensionVersion = "1.5.3"
+            kotlinCompilerExtensionVersion = "1.5.4"
         }
     }
@@ Expand Down @@