diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-wasm-test/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-wasm-test/build.gradle.kts index ddbd160bfb8..88ad74e8da5 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-wasm-test/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-wasm-test/build.gradle.kts @@ -8,9 +8,7 @@ repositories { } with(org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin.apply(rootProject)) { - //canary nodejs that supports wasm GC M6 - nodeVersion = "20.0.0-v8-canary2022112061c569ba0d" - nodeDownloadBaseUrl = "https://nodejs.org/download/v8-canary" + nodeVersion = "20.2.0" } with(org.jetbrains.kotlin.gradle.targets.js.d8.D8RootPlugin.apply(rootProject)) { @@ -19,10 +17,10 @@ with(org.jetbrains.kotlin.gradle.targets.js.d8.D8RootPlugin.apply(rootProject)) version = (version as String) } -with(org.jetbrains.kotlin.gradle.targets.js.yarn.YarnPlugin.apply(rootProject)) { - //A little hacky way to disable yarn for unsupported nightly node version - command = "echo" - download = false +allprojects.forEach { + it.tasks.withType().configureEach { + args.add("--ignore-engines") + } } tasks.named("kotlinStoreYarnLock") { diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/binaryen/BinaryenExec.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/binaryen/BinaryenExec.kt index 7b9be7b23fa..a6041528ceb 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/binaryen/BinaryenExec.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/binaryen/BinaryenExec.kt @@ -37,7 +37,7 @@ constructor() : AbstractExecTask(BinaryenExec::class.java) { // Other options "--enable-nontrapping-float-to-int", "--nominal", - // TODO uncomment after switching to 112+ + // It's turned out that it's not safe // "--closed-world", // Optimizations: @@ -50,15 +50,14 @@ constructor() : AbstractExecTask(BinaryenExec::class.java) { "--inline-functions-with-loops", "--traps-never-happen", "--fast-math", - // TODO uncomment after switching to 112+ - // "--type-ssa", - "-O4", - "-O4", + "--type-ssa", + "-O3", + "-O3", "--gufa", - "-O4", - // TODO uncomment after switching to 112+ + "-O3", + // requires --closed-world // "--type-merging", - "-O4", + "-O3", "-Oz", ) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/binaryen/BinaryenRootExtension.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/binaryen/BinaryenRootExtension.kt index 5c4527edac1..2c4f50bff35 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/binaryen/BinaryenRootExtension.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/binaryen/BinaryenRootExtension.kt @@ -25,8 +25,7 @@ open class BinaryenRootExtension(@Transient val rootProject: Project) : Configur var installationPath by Property(gradleHome.resolve("binaryen")) var downloadBaseUrl by Property("https://github.com/WebAssembly/binaryen/releases/download/") - // TODO stop using old GC instructions before moving to 112+ - var version by Property("111") + var version by Property("112") val setupTaskProvider: TaskProvider get() = rootProject.tasks.withType(Copy::class.java).named(BinaryenRootPlugin.INSTALL_TASK_NAME) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/d8/D8RootExtension.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/d8/D8RootExtension.kt index d4399b40351..8bfba18a215 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/d8/D8RootExtension.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/d8/D8RootExtension.kt @@ -41,7 +41,7 @@ open class D8RootExtension(@Transient val rootProject: Project) : ConfigurationP fi; done; */ - var version by Property("11.1.31") + var version by Property("11.5.99") var edition by Property("rel") // rel or dbg val setupTaskProvider: TaskProvider