From c3d28ed7713a88661e50057752e7d731c9959f14 Mon Sep 17 00:00:00 2001 From: Michael Bull Date: Sun, 3 Mar 2024 13:57:22 +0000 Subject: [PATCH] Simplify configuration of KotlinNpmInstallTask --- .../src/main/kotlin/kotlin-conventions.gradle.kts | 13 +++++++++++++ kotlin-result/build.gradle.kts | 12 ------------ 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/buildSrc/src/main/kotlin/kotlin-conventions.gradle.kts b/buildSrc/src/main/kotlin/kotlin-conventions.gradle.kts index 4b223f8..bbb607e 100644 --- a/buildSrc/src/main/kotlin/kotlin-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/kotlin-conventions.gradle.kts @@ -1,3 +1,6 @@ +import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension +import org.jetbrains.kotlin.gradle.targets.js.npm.tasks.KotlinNpmInstallTask + plugins { kotlin("multiplatform") } @@ -64,3 +67,13 @@ tasks.withType { into("META-INF") } } + +/* https://youtrack.jetbrains.com/issue/KT-63014/Running-tests-with-wasmJs-in-1.9.20-requires-Chrome-Canary#focus=Comments-27-8321383.0-0 */ +rootProject.the().apply { + nodeVersion = "21.0.0-v8-canary202309143a48826a08" + nodeDownloadBaseUrl = "https://nodejs.org/download/v8-canary" +} + +rootProject.tasks.withType { + args.add("--ignore-engines") +} diff --git a/kotlin-result/build.gradle.kts b/kotlin-result/build.gradle.kts index 58cb8ca..24c71b8 100644 --- a/kotlin-result/build.gradle.kts +++ b/kotlin-result/build.gradle.kts @@ -1,6 +1,4 @@ import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl -import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension -import org.jetbrains.kotlin.gradle.targets.js.npm.tasks.KotlinNpmInstallTask plugins { `maven-publish` @@ -25,13 +23,3 @@ kotlin { nodejs() } } - -/* https://youtrack.jetbrains.com/issue/KT-63014/Running-tests-with-wasmJs-in-1.9.20-requires-Chrome-Canary#focus=Comments-27-8321383.0-0 */ -rootProject.the().apply { - nodeVersion = "21.0.0-v8-canary202309143a48826a08" - nodeDownloadBaseUrl = "https://nodejs.org/download/v8-canary" -} - -rootProject.tasks.withType().configureEach { - args.add("--ignore-engines") -}