Merge pull request #34 from cketti/update_kotlin

Update Kotlin to 2.0.0
cketti · Jun 9, 2024 · 95bb757 · 95bb757
2 parents 7dce8fd + 352a964
commit 95bb757
Show file tree

Hide file tree

Showing 5 changed files with 125 additions and 111 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## [Unreleased]
+### Changed
+- Updated to Kotlin 2.0.0
+
 ## [0.7.0] - 2024-03-02
 ### Added
 - Added `StringBuilder.setCodePointAt()`, `StringBuilder.insertCodePointAt()`, and `StringBuilder.deleteCodePointAt()` 

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-kotlin = "1.9.24"
+kotlin = "2.0.0"
 
 [plugins]
 kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }

diff --git a/kotlin-codepoints-deluxe/build.gradle.kts b/kotlin-codepoints-deluxe/build.gradle.kts
@@ -1,3 +1,6 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
+
 plugins {
     alias(libs.plugins.kotlin.multiplatform)
     alias(libs.plugins.vanniktech.maven.publish)
@@ -17,11 +20,7 @@ kotlin {
         browser {}
     }
 
-    jvm {
-        compilations.all {
-            kotlinOptions.jvmTarget = "1.8"
-        }
-    }
+    jvm()
 
     linuxArm64()
     linuxX64()
@@ -61,6 +60,10 @@ kotlin {
     }
 }
 
+tasks.withType<KotlinJvmCompile> {
+    compilerOptions.jvmTarget.set(JvmTarget.JVM_1_8)
+}
+
 @Suppress("UnstableApiUsage")
 mavenPublishing {
     pom {

diff --git a/kotlin-codepoints/build.gradle.kts b/kotlin-codepoints/build.gradle.kts
@@ -1,4 +1,6 @@
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
 
 plugins {
     alias(libs.plugins.kotlin.multiplatform)
@@ -19,11 +21,7 @@ kotlin {
         browser {}
     }
 
-    jvm {
-        compilations.all {
-            kotlinOptions.jvmTarget = "1.8"
-        }
-    }
+    jvm()
 
     linuxArm64()
     linuxX64()
@@ -50,10 +48,14 @@ kotlin {
 
     @OptIn(ExperimentalKotlinGradlePluginApi::class)
     applyDefaultHierarchyTemplate {
-        group("nonJvm") {
-            withJs()
-            withNative()
-            withWasm()
+        common {
+            withJvm()
+            group("nonJvm") {
+                withJs()
+                withNative()
+                withWasmJs()
+                withWasmWasi()
+            }
         }
     }
 
@@ -66,6 +68,10 @@ kotlin {
     }
 }
 
+tasks.withType<KotlinJvmCompile> {
+    compilerOptions.jvmTarget.set(JvmTarget.JVM_1_8)
+}
+
 @Suppress("UnstableApiUsage")
 mavenPublishing {
     pom {