Skip to content

Commit abee7d1

Browse files
committed
AMEND (update kotlin to 1.9.20-Beta2 and nodejs to canary)
1 parent 15d7de0 commit abee7d1

File tree

6 files changed

+22
-8
lines changed

6 files changed

+22
-8
lines changed

build.gradle

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -378,9 +378,16 @@ if (CacheRedirector.enabled) {
378378
}
379379
}
380380

381-
// Drop this configuration when the Node.JS version in KGP is at least 20.2.0
381+
// Drop this configuration when the Node.JS version in KGP will support wasm gc milestone 4
382382
// check it here:
383383
// https://github.com/JetBrains/kotlin/blob/master/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsRootExtension.kt
384384
extensions.findByType(org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension.class).with {
385-
it.nodeVersion = "20.2.0"
386-
}
385+
// canary nodejs that supports recent Wasm GC changes
386+
it.nodeVersion = "21.0.0-v8-canary202309167e82ab1fa2"
387+
it.nodeDownloadBaseUrl = "https://nodejs.org/download/v8-canary"
388+
}
389+
390+
// Drop this when node js version become stable
391+
tasks.withType(org.jetbrains.kotlin.gradle.targets.js.npm.tasks.KotlinNpmInstallTask).configureEach {
392+
args.add("--ignore-engines")
393+
}

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# Kotlin
66
version=1.7.2-SNAPSHOT
77
group=org.jetbrains.kotlinx
8-
kotlin_version=1.9.20-Beta
8+
kotlin_version=1.9.20-Beta2
99

1010
# Dependencies
1111
junit_version=4.12

integration-testing/build.gradle

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,3 +179,8 @@ compileKotlin {
179179
jvmTarget = "1.8"
180180
}
181181
}
182+
183+
// Drop this when node js version become stable
184+
tasks.withType(org.jetbrains.kotlin.gradle.targets.js.npm.tasks.KotlinNpmInstallTask.class).configureEach {
185+
it.args.add("--ignore-engines")
186+
}

integration-testing/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
kotlin_version=1.9.20-Beta
1+
kotlin_version=1.9.20-Beta2
22
coroutines_version=1.7.2-SNAPSHOT
33
asm_version=9.3
44

integration-testing/smokeTest/build.gradle

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,11 @@ kotlin {
6060
}
6161
}
6262

63-
// Drop this configuration when the Node.JS version in KGP is at least 20.2.0
63+
// Drop this configuration when the Node.JS version in KGP will support wasm gc milestone 4
6464
// check it here:
6565
// https://github.com/JetBrains/kotlin/blob/master/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsRootExtension.kt
6666
rootProject.extensions.findByType(org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension.class).with {
67-
it.nodeVersion = "20.2.0"
67+
// canary nodejs that supports recent Wasm GC changes
68+
it.nodeVersion = "21.0.0-v8-canary202309167e82ab1fa2"
69+
it.nodeDownloadBaseUrl = "https://nodejs.org/download/v8-canary"
6870
}

kotlinx-coroutines-test/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ kotlin {
2828
}
2929
}
3030

31-
wasm {
31+
wasmJs {
3232
nodejs {
3333
testTask {
3434
filter.apply {

0 commit comments

Comments
 (0)