Skip to content

Commit cabbf69

Browse files
committed
Update Kotlin to 2.1.20
1 parent a1d7dbe commit cabbf69

File tree

5 files changed

+615
-530
lines changed

5 files changed

+615
-530
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Changelog
22

3+
## [Unreleased]
4+
### Changed
5+
- Updated to Kotlin 2.1.20
6+
37
## [0.9.0] - 2024-06-24
48
### Changed
59
- kotlin-codepoints-deluxe

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[versions]
2-
kotlin = "2.0.0"
2+
kotlin = "2.1.20"
33

44
[plugins]
55
kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }

kotlin-codepoints-deluxe/build.gradle.kts

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1+
import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
12
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
2-
import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
33

44
plugins {
55
alias(libs.plugins.kotlin.multiplatform)
@@ -16,11 +16,16 @@ kotlin {
1616
iosX64()
1717
iosSimulatorArm64()
1818

19-
js(IR) {
20-
browser {}
19+
js {
20+
browser()
21+
nodejs()
2122
}
2223

23-
jvm()
24+
jvm {
25+
compilerOptions {
26+
jvmTarget.set(JvmTarget.JVM_1_8)
27+
}
28+
}
2429

2530
linuxArm64()
2631
linuxX64()
@@ -34,10 +39,16 @@ kotlin {
3439
tvosX64()
3540
tvosSimulatorArm64()
3641

37-
@Suppress("OPT_IN_USAGE")
38-
wasmJs()
39-
@Suppress("OPT_IN_USAGE")
40-
wasmWasi()
42+
@OptIn(ExperimentalWasmDsl::class)
43+
wasmJs {
44+
browser()
45+
nodejs()
46+
}
47+
48+
@OptIn(ExperimentalWasmDsl::class)
49+
wasmWasi {
50+
nodejs()
51+
}
4152

4253
watchosArm32()
4354
watchosArm64()
@@ -60,11 +71,6 @@ kotlin {
6071
}
6172
}
6273

63-
tasks.withType<KotlinJvmCompile> {
64-
compilerOptions.jvmTarget.set(JvmTarget.JVM_1_8)
65-
}
66-
67-
@Suppress("UnstableApiUsage")
6874
mavenPublishing {
6975
pom {
7076
name.set("kotlin-codepoint-deluxe")

kotlin-codepoints/build.gradle.kts

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
2+
import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
23
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
3-
import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
44

55
plugins {
66
alias(libs.plugins.kotlin.multiplatform)
@@ -17,11 +17,16 @@ kotlin {
1717
iosX64()
1818
iosSimulatorArm64()
1919

20-
js(IR) {
21-
browser {}
20+
js {
21+
browser()
22+
nodejs()
2223
}
2324

24-
jvm()
25+
jvm {
26+
compilerOptions {
27+
jvmTarget.set(JvmTarget.JVM_1_8)
28+
}
29+
}
2530

2631
linuxArm64()
2732
linuxX64()
@@ -35,10 +40,16 @@ kotlin {
3540
tvosX64()
3641
tvosSimulatorArm64()
3742

38-
@Suppress("OPT_IN_USAGE")
39-
wasmJs()
40-
@Suppress("OPT_IN_USAGE")
41-
wasmWasi()
43+
@OptIn(ExperimentalWasmDsl::class)
44+
wasmJs {
45+
browser()
46+
nodejs()
47+
}
48+
49+
@OptIn(ExperimentalWasmDsl::class)
50+
wasmWasi {
51+
nodejs()
52+
}
4253

4354
watchosArm32()
4455
watchosArm64()
@@ -68,11 +79,6 @@ kotlin {
6879
}
6980
}
7081

71-
tasks.withType<KotlinJvmCompile> {
72-
compilerOptions.jvmTarget.set(JvmTarget.JVM_1_8)
73-
}
74-
75-
@Suppress("UnstableApiUsage")
7682
mavenPublishing {
7783
pom {
7884
name.set("kotlin-codepoint")

0 commit comments

Comments
 (0)