Skip to content

Commit

Permalink
AMEND (update kotlin to 1.9.20-Beta2 and nodejs to canary)
Browse files Browse the repository at this point in the history
  • Loading branch information
igoriakovlev committed Sep 21, 2023
1 parent 5c07400 commit 49d24e3
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 8 deletions.
13 changes: 10 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -378,9 +378,16 @@ if (CacheRedirector.enabled) {
}
}

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

// Drop this when node js version become stable
tasks.withType(org.jetbrains.kotlin.gradle.targets.js.npm.tasks.KotlinNpmInstallTask).configureEach {
args.add("--ignore-engines")
}
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# Kotlin
version=1.7.2-SNAPSHOT
group=org.jetbrains.kotlinx
kotlin_version=1.9.20-Beta
kotlin_version=1.9.20-Beta2

# Dependencies
junit_version=4.12
Expand Down
5 changes: 5 additions & 0 deletions integration-testing/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -179,3 +179,8 @@ compileKotlin {
jvmTarget = "1.8"
}
}

// Drop this when node js version become stable
tasks.withType(org.jetbrains.kotlin.gradle.targets.js.npm.tasks.KotlinNpmInstallTask.class).configureEach {
it.args.add("--ignore-engines")
}
2 changes: 1 addition & 1 deletion integration-testing/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
kotlin_version=1.9.20-Beta
kotlin_version=1.9.20-Beta2
coroutines_version=1.7.2-SNAPSHOT
asm_version=9.3

Expand Down
6 changes: 4 additions & 2 deletions integration-testing/smokeTest/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,11 @@ kotlin {
}
}

// Drop this configuration when the Node.JS version in KGP is at least 20.2.0
// Drop this configuration when the Node.JS version in KGP will support wasm gc milestone 4
// check it here:
// https://github.com/JetBrains/kotlin/blob/master/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsRootExtension.kt
rootProject.extensions.findByType(org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension.class).with {
it.nodeVersion = "20.2.0"
// canary nodejs that supports recent Wasm GC changes
it.nodeVersion = "21.0.0-v8-canary202309167e82ab1fa2"
it.nodeDownloadBaseUrl = "https://nodejs.org/download/v8-canary"
}
2 changes: 1 addition & 1 deletion kotlinx-coroutines-test/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ kotlin {
}
}

wasm {
wasmJs {
nodejs {
testTask {
filter.apply {
Expand Down

0 comments on commit 49d24e3

Please sign in to comment.