Update to Kotlin 2.0.20

streem · Sep 3, 2024 · 6d4da98 · 6d4da98
1 parent 87fc19a
commit 6d4da98
Show file tree

Hide file tree

Showing 14 changed files with 501 additions and 1,011 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,7 +17,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ### Changed
 
-* Updated dependencies to Kotlin 2.0.10 and kotlinx-serialization 1.7.1. (PR [#270])
+* Updated dependencies to Kotlin 2.0.20 and kotlinx-serialization 1.7.2. (PR [#270])
 * Updated the protobuf well-known types to include all of the new fields added as of protobuf v28.0. This mainly impacts messages defined in `descriptor.proto`. (PR [#280])
 
 ### Fixed

diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
@@ -4,13 +4,13 @@ object Versions {
     const val androidTargetSdk = 34
     const val binaryCompatibilityValidatorGradlePlugin = "0.16.3"
     const val jvmTarget = "1.8"
-    const val kotlin = "2.0.10"
-    const val kotlinCoroutines = "1.9.0-RC"
+    const val kotlin = "2.0.20"
+    const val kotlinCoroutines = "1.9.0-RC.2"
     const val kotlinIo = "0.5.3"
-    const val kotlinSerialization = "1.7.1"
+    const val kotlinSerialization = "1.7.2"
     const val robolectric = "11-robolectric-6757853"
     const val osDetectorGradlePlugin = "1.7.3"
     const val protoc = "4.28.0"
     const val protobufJava = protoc
     const val springBootGradlePlugin = "2.4.5"
-}
+}
diff --git a/conformance/lib/build.gradle.kts b/conformance/lib/build.gradle.kts
@@ -1,7 +1,7 @@
 import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {

diff --git a/examples/browser-js/build.gradle.kts b/examples/browser-js/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    kotlin("multiplatform") version "2.0.10" apply false
+    kotlin("multiplatform") version "2.0.20" apply false
     id("com.google.protobuf") version "0.9.4" apply false
 }
 

diff --git a/examples/browser-js/kotlin-js-store/yarn.lock b/examples/browser-js/kotlin-js-store/yarn.lock
diff --git a/examples/browser-wasm/app/build.gradle.kts b/examples/browser-wasm/app/build.gradle.kts
@@ -1,4 +1,4 @@
-import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
+import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 
 plugins {
     kotlin("multiplatform")
@@ -21,4 +21,4 @@ kotlin {
             }
         }
     }
-}
+}
diff --git a/examples/browser-wasm/build.gradle.kts b/examples/browser-wasm/build.gradle.kts
@@ -1,15 +1,15 @@
 plugins {
-    kotlin("multiplatform") version "2.0.10" apply false
+    kotlin("multiplatform") version "2.0.20" apply false
     id("com.google.protobuf") version "0.9.4" apply false
 }
 
 val pbandkVersion by extra("0.16.0-SNAPSHOT")
 
 subprojects {
     repositories {
-//        if (System.getenv("CI") == "true") {
+        if (System.getenv("CI") == "true") {
             mavenLocal()
-//        }
+        }
         mavenCentral()
     }
-}
+}