From 8c95665e27f72b87922cfc061942ab9d358b8faf Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Tue, 28 Nov 2023 10:36:36 +0000 Subject: [PATCH] [Gradle, JS] Deprecate specific Node.js properties ^KT-62780 fixed --- build.gradle.kts | 4 ++-- .../testProject/new-mpp-wasm-test/build.gradle.kts | 4 ++-- .../new-mpp-wasm-wasi-test/build.gradle.kts | 4 ++-- .../gradle/targets/js/nodejs/NodeJsRootExtension.kt | 9 +++------ .../src/main/kotlin/resolve-dependencies.gradle.kts | 10 +++++----- 5 files changed, 14 insertions(+), 17 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 07af946b3a9..6009ec68a4a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1084,8 +1084,8 @@ val cacheRedirectorEnabled = findProperty("cacheRedirectorEnabled")?.toString()? plugins.withType(org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin::class) { extensions.configure(org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension::class.java) { // Node.js with canary v8 that supports recent Wasm GC changes - nodeVersion = "21.0.0-v8-canary20231019bd785be450" - nodeDownloadBaseUrl = if (cacheRedirectorEnabled) + version = "21.0.0-v8-canary20231019bd785be450" + downloadBaseUrl = if (cacheRedirectorEnabled) "https://cache-redirector.jetbrains.com/nodejs.org/download/v8-canary" else "https://nodejs.org/download/v8-canary" 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 36f9b4ad867..3b5928c4547 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 @@ -9,8 +9,8 @@ repositories { with(org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin.apply(rootProject)) { // canary nodejs that supports recent Wasm GC changes - nodeVersion = "21.0.0-v8-canary20231019bd785be450" - nodeDownloadBaseUrl = "https://nodejs.org/download/v8-canary" + version = "21.0.0-v8-canary20231019bd785be450" + downloadBaseUrl = "https://nodejs.org/download/v8-canary" } with(org.jetbrains.kotlin.gradle.targets.js.d8.D8RootPlugin.apply(rootProject)) { diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-wasm-wasi-test/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-wasm-wasi-test/build.gradle.kts index 432e2c4f58f..20d6a946ff9 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-wasm-wasi-test/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-wasm-wasi-test/build.gradle.kts @@ -4,8 +4,8 @@ plugins { with(org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin.apply(rootProject)) { // canary nodejs that supports recent Wasm GC changes - nodeVersion = "21.0.0-v8-canary20231019bd785be450" - nodeDownloadBaseUrl = "https://nodejs.org/download/v8-canary" + version = "21.0.0-v8-canary20231019bd785be450" + downloadBaseUrl = "https://nodejs.org/download/v8-canary" } with(org.jetbrains.kotlin.gradle.targets.js.d8.D8RootPlugin.apply(rootProject)) { diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsRootExtension.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsRootExtension.kt index 0e44d203e5d..73d670aa0f2 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsRootExtension.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsRootExtension.kt @@ -58,8 +58,7 @@ open class NodeJsRootExtension( override var download by Property(true) - // deprecate after bootstrap -// @Deprecated("Use downloadBaseUrl instead", ReplaceWith("downloadBaseUrl")) + @Deprecated("Use downloadBaseUrl instead", ReplaceWith("downloadBaseUrl")) var nodeDownloadBaseUrl get() = downloadBaseUrl set(value) { @@ -68,8 +67,7 @@ open class NodeJsRootExtension( override var downloadBaseUrl: String? by Property("https://nodejs.org/dist") - // deprecate after bootstrap -// @Deprecated("Use version instead", ReplaceWith("version")) + @Deprecated("Use version instead", ReplaceWith("version")) var nodeVersion get() = version set(value) { @@ -83,8 +81,7 @@ open class NodeJsRootExtension( override var command by Property("node") - // deprecate after bootstrap -// @Deprecated("Use command instead", ReplaceWith("command")) + @Deprecated("Use command instead", ReplaceWith("command")) var nodeCommand get() = command set(value) { diff --git a/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/resolve-dependencies.gradle.kts b/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/resolve-dependencies.gradle.kts index 70c5b85c44d..14972dbf5b2 100644 --- a/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/resolve-dependencies.gradle.kts +++ b/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/resolve-dependencies.gradle.kts @@ -59,13 +59,13 @@ tasks.register("resolveDependencies") { rootProject.extensions.findByType()?.run { project.resolveDependencies( - "org.nodejs:node:$nodeVersion:linux-x64@tar.gz", - "org.nodejs:node:$nodeVersion:win-x64@zip", - "org.nodejs:node:$nodeVersion:darwin-x64@tar.gz", - "org.nodejs:node:$nodeVersion:darwin-arm64@tar.gz" + "org.nodejs:node:$version:linux-x64@tar.gz", + "org.nodejs:node:$version:win-x64@zip", + "org.nodejs:node:$version:darwin-x64@tar.gz", + "org.nodejs:node:$version:darwin-arm64@tar.gz" ) { ivy { - url = URI(nodeDownloadBaseUrl) + url = URI(downloadBaseUrl) patternLayout { artifact("v[revision]/[artifact](-v[revision]-[classifier]).[ext]") }