diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 9c7d6852c8d..4e004e0b336 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -24,6 +24,7 @@ junit5 = "5.10.0" junit-platform = "1.10.0" android-gradle-plugin = "7.1.3" android-tools = "30.3.1" +gradle-node = "7.0.1" [libraries] dexMemberList = { module = "com.jakewharton.dex:dex-member-list", version.ref = "dexMemberList" } @@ -74,3 +75,4 @@ android-tools-common = { module = "com.android.tools:common", version.ref = "and [plugins] jetbrains-ideaExt = { id = "org.jetbrains.gradle.plugin.idea-ext", version.ref = "jetbrains-ideaExt" } +gradle-node = { id = "com.github.node-gradle.node", version.ref = "gradle-node" } diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index ce4b1bc2d44..8277fd99838 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -718,10 +718,10 @@ - - - - + + + + diff --git a/js/js.tests/build.gradle.kts b/js/js.tests/build.gradle.kts index 01be3931fd4..a99a4829d24 100644 --- a/js/js.tests/build.gradle.kts +++ b/js/js.tests/build.gradle.kts @@ -11,7 +11,7 @@ plugins { kotlin("jvm") kotlin("plugin.serialization") id("jps-compatible") - id("com.github.node-gradle.node") version "5.0.0" + alias(libs.plugins.gradle.node) } val cacheRedirectorEnabled = findProperty("cacheRedirectorEnabled")?.toString()?.toBoolean() == true @@ -230,7 +230,7 @@ val generateTypeScriptJsExportOnFileTests by parallel( fun Test.setupNodeJs() { systemProperty("javascript.engine.path.NodeJs", com.github.gradle.node.variant.VariantComputer() .let { variantComputer -> - computeNodeExec(node, variantComputer.computeNodeBinDir(node.computedNodeDir)).get() + computeNodeExec(node, variantComputer.computeNodeBinDir(node.resolvedNodeDir, node.resolvedPlatform)).get() } ) } diff --git a/js/npm/build.gradle.kts b/js/npm/build.gradle.kts index 1bd3ae6c770..21c8ba7f52f 100644 --- a/js/npm/build.gradle.kts +++ b/js/npm/build.gradle.kts @@ -1,7 +1,7 @@ import com.github.gradle.node.npm.task.NpmTask plugins { - id("com.github.node-gradle.node") version "5.0.0" + alias(libs.plugins.gradle.node) base } diff --git a/libraries/kotlin.test/js-ir/it/build.gradle.kts b/libraries/kotlin.test/js-ir/it/build.gradle.kts index 5187d5ab710..d84582f694b 100644 --- a/libraries/kotlin.test/js-ir/it/build.gradle.kts +++ b/libraries/kotlin.test/js-ir/it/build.gradle.kts @@ -7,7 +7,7 @@ import java.io.FileOutputStream plugins { kotlin("js") - id("com.github.node-gradle.node") version "5.0.0" + alias(libs.plugins.gradle.node) } description = "Kotlin-test integration tests for JS IR" diff --git a/libraries/tools/kotlin-test-js-runner/build.gradle.kts b/libraries/tools/kotlin-test-js-runner/build.gradle.kts index a76c8292b32..a2d2c46a75c 100644 --- a/libraries/tools/kotlin-test-js-runner/build.gradle.kts +++ b/libraries/tools/kotlin-test-js-runner/build.gradle.kts @@ -4,7 +4,7 @@ description = "Simple Kotlin/JS tests runner with TeamCity reporter" plugins { id("base") - id("com.github.node-gradle.node") version "5.0.0" + alias(libs.plugins.gradle.node) } publish(sbom = false)