Merge pull request #43 from cketti/update-kotlin

Update Kotlin to 2.1.20

Author: cketti

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## [Unreleased]
+### Changed
+- Updated to Kotlin 2.1.20
+
 ## [0.9.0] - 2024-06-24
 ### Changed
 - kotlin-codepoints-deluxe

gradle/libs.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-kotlin = "2.0.0"
+kotlin = "2.1.20"
 
 [plugins]
 kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }

kotlin-codepoints-deluxe/build.gradle.kts

@@ -1,5 +1,5 @@
+import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
 
 plugins {
     alias(libs.plugins.kotlin.multiplatform)
@@ -16,11 +16,16 @@ kotlin {
     iosX64()
     iosSimulatorArm64()
 
-    js(IR) {
-        browser {}
+    js {
+        browser()
+        nodejs()
     }
 
-    jvm()
+    jvm {
+        compilerOptions {
+            jvmTarget.set(JvmTarget.JVM_1_8)
+        }
+    }
 
     linuxArm64()
     linuxX64()
@@ -34,10 +39,16 @@ kotlin {
     tvosX64()
     tvosSimulatorArm64()
 
-    @Suppress("OPT_IN_USAGE")
-    wasmJs()
-    @Suppress("OPT_IN_USAGE")
-    wasmWasi()
+    @OptIn(ExperimentalWasmDsl::class)
+    wasmJs {
+        browser()
+        nodejs()
+    }
+
+    @OptIn(ExperimentalWasmDsl::class)
+    wasmWasi {
+        nodejs()
+    }
 
     watchosArm32()
     watchosArm64()
@@ -60,11 +71,6 @@ kotlin {
     }
 }
 
-tasks.withType<KotlinJvmCompile> {
-    compilerOptions.jvmTarget.set(JvmTarget.JVM_1_8)
-}
-
-@Suppress("UnstableApiUsage")
 mavenPublishing {
     pom {
         name.set("kotlin-codepoint-deluxe")

kotlin-codepoints/build.gradle.kts

@@ -1,6 +1,6 @@
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
 
 plugins {
     alias(libs.plugins.kotlin.multiplatform)
@@ -17,11 +17,16 @@ kotlin {
     iosX64()
     iosSimulatorArm64()
 
-    js(IR) {
-        browser {}
+    js {
+        browser()
+        nodejs()
     }
 
-    jvm()
+    jvm {
+        compilerOptions {
+            jvmTarget.set(JvmTarget.JVM_1_8)
+        }
+    }
 
     linuxArm64()
     linuxX64()
@@ -35,10 +40,16 @@ kotlin {
     tvosX64()
     tvosSimulatorArm64()
 
-    @Suppress("OPT_IN_USAGE")
-    wasmJs()
-    @Suppress("OPT_IN_USAGE")
-    wasmWasi()
+    @OptIn(ExperimentalWasmDsl::class)
+    wasmJs {
+        browser()
+        nodejs()
+    }
+
+    @OptIn(ExperimentalWasmDsl::class)
+    wasmWasi {
+        nodejs()
+    }
 
     watchosArm32()
     watchosArm64()
@@ -68,11 +79,6 @@ kotlin {
     }
 }
 
-tasks.withType<KotlinJvmCompile> {
-    compilerOptions.jvmTarget.set(JvmTarget.JVM_1_8)
-}
-
-@Suppress("UnstableApiUsage")
 mavenPublishing {
     pom {
         name.set("kotlin-codepoint")