[Wasm] Update versions of nodejs, d8 and binaryen

This commit is contained in:
Igor Yakovlev
2023-05-15 20:17:17 +02:00
committed by Space Team
parent ed1c15b64b
commit 1c716cee9c
4 changed files with 14 additions and 18 deletions
@@ -8,9 +8,7 @@ repositories {
} }
with(org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin.apply(rootProject)) { with(org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin.apply(rootProject)) {
//canary nodejs that supports wasm GC M6 nodeVersion = "20.2.0"
nodeVersion = "20.0.0-v8-canary2022112061c569ba0d"
nodeDownloadBaseUrl = "https://nodejs.org/download/v8-canary"
} }
with(org.jetbrains.kotlin.gradle.targets.js.d8.D8RootPlugin.apply(rootProject)) { 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) version = (version as String)
} }
with(org.jetbrains.kotlin.gradle.targets.js.yarn.YarnPlugin.apply(rootProject)) { allprojects.forEach {
//A little hacky way to disable yarn for unsupported nightly node version it.tasks.withType<org.jetbrains.kotlin.gradle.targets.js.npm.tasks.KotlinNpmInstallTask>().configureEach {
command = "echo" args.add("--ignore-engines")
download = false }
} }
tasks.named<org.jetbrains.kotlin.gradle.targets.js.yarn.YarnLockCopyTask>("kotlinStoreYarnLock") { tasks.named<org.jetbrains.kotlin.gradle.targets.js.yarn.YarnLockCopyTask>("kotlinStoreYarnLock") {
@@ -37,7 +37,7 @@ constructor() : AbstractExecTask<BinaryenExec>(BinaryenExec::class.java) {
// Other options // Other options
"--enable-nontrapping-float-to-int", "--enable-nontrapping-float-to-int",
"--nominal", "--nominal",
// TODO uncomment after switching to 112+ // It's turned out that it's not safe
// "--closed-world", // "--closed-world",
// Optimizations: // Optimizations:
@@ -50,15 +50,14 @@ constructor() : AbstractExecTask<BinaryenExec>(BinaryenExec::class.java) {
"--inline-functions-with-loops", "--inline-functions-with-loops",
"--traps-never-happen", "--traps-never-happen",
"--fast-math", "--fast-math",
// TODO uncomment after switching to 112+ "--type-ssa",
// "--type-ssa", "-O3",
"-O4", "-O3",
"-O4",
"--gufa", "--gufa",
"-O4", "-O3",
// TODO uncomment after switching to 112+ // requires --closed-world
// "--type-merging", // "--type-merging",
"-O4", "-O3",
"-Oz", "-Oz",
) )
@@ -25,8 +25,7 @@ open class BinaryenRootExtension(@Transient val rootProject: Project) : Configur
var installationPath by Property(gradleHome.resolve("binaryen")) var installationPath by Property(gradleHome.resolve("binaryen"))
var downloadBaseUrl by Property("https://github.com/WebAssembly/binaryen/releases/download/") 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("112")
var version by Property("111")
val setupTaskProvider: TaskProvider<out Copy> val setupTaskProvider: TaskProvider<out Copy>
get() = rootProject.tasks.withType(Copy::class.java).named(BinaryenRootPlugin.INSTALL_TASK_NAME) get() = rootProject.tasks.withType(Copy::class.java).named(BinaryenRootPlugin.INSTALL_TASK_NAME)
@@ -41,7 +41,7 @@ open class D8RootExtension(@Transient val rootProject: Project) : ConfigurationP
fi; fi;
done; done;
*/ */
var version by Property("11.1.31") var version by Property("11.5.99")
var edition by Property("rel") // rel or dbg var edition by Property("rel") // rel or dbg
val setupTaskProvider: TaskProvider<out Copy> val setupTaskProvider: TaskProvider<out Copy>