Migrate to kotlin 1.9.20 (#150)

benasher44 · Nov 10, 2023 · 2b8aec2 · 2b8aec2
1 parent 96c1d3e
commit 2b8aec2
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/), and this
 project adheres to [Semantic Versioning](https://semver.org/).
 
+## [0.8.2]
+### Changed
+- Bump kotlin to 1.9.20
+- Rename "wasm" target to "wasmJs" (required by kotlin 1.9.20)
+
 ## [0.8.1] - 2023-08-25
 ### Changed
 - Set apiVersion and languageVersion on the JVM for better compatibility (#147)

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinNativeCompile
 import org.jetbrains.kotlin.konan.target.HostManager
 
 plugins {
-    kotlin("multiplatform") version "1.9.0"
+    kotlin("multiplatform") version "1.9.20"
     id("org.jetbrains.dokka") version "1.8.20"
     id("maven-publish")
     id("signing")
@@ -39,11 +39,11 @@ kotlin {
                 kotlinOptions {
                     jvmTarget = "1.8"
                     apiVersion = "1.7"
-                    languageVersion = "1.7"
+                    languageVersion = "1.9"
                 }
             }
         }
-        wasm {
+        wasmJs {
             d8()
         }
         if (HostManager.hostIsMac) {
@@ -75,7 +75,7 @@ kotlin {
     sourceSets {
         val commonMain by getting {
             dependencies {
-                implementation("org.jetbrains.kotlin:kotlin-stdlib:1.7.21")
+                implementation("org.jetbrains.kotlin:kotlin-stdlib:1.9.20")
             }
         }
         val commonTest by getting {
@@ -87,12 +87,7 @@ kotlin {
         val nonJvmMain by creating { dependsOn(commonMain) }
         val nonJvmTest by creating { dependsOn(commonTest) }
         val jsMain by getting { dependsOn(nonJvmMain) }
-        val wasmMain by getting {
-            dependsOn(nonJvmMain)
-            dependencies {
-                implementation("org.jetbrains.kotlin:kotlin-stdlib-wasm")
-            }
-        }
+        val wasmJsMain by getting { dependsOn(nonJvmMain) }
         val jsTest by getting { dependsOn(nonJvmTest) }
         val nativeMain by creating { dependsOn(nonJvmMain) }
         val nativeTest by creating { dependsOn(nonJvmTest) }

diff --git a/gradle.properties b/gradle.properties
@@ -5,7 +5,7 @@ kotlin.code.style=official
 kotlin.incremental=true
 
 GROUP=com.benasher44
-VERSION=0.8.1
+VERSION=0.8.2
 
 POM_URL=https://github.com/benasher44/uuid/
 POM_SCM_URL=https://github.com/benasher44/uuid/

diff --git a/src/wasmMain/kotlin/platform.kt → src/wasmJsMain/kotlin/platform.kt b/src/wasmMain/kotlin/platform.kt → src/wasmJsMain/kotlin/platform.kt