azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Gradle, JS] Deprecate specific Node.js properties

Browse Source 
^KT-62780 fixed
This commit is contained in:
Ilya Goncharov
2023-11-28 10:36:36 +00:00
committed by Space Team
parent 1805f322f8
commit 8c95665e27
5 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.gradle.kts
+2 -2
View File
@@ -1084,8 +1084,8 @@ val cacheRedirectorEnabled = findProperty("cacheRedirectorEnabled")?.toString()?
plugins.withType(org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin::class) { plugins.withType(org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin::class) {
extensions.configure(org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension::class.java) { extensions.configure(org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension::class.java) {
// Node.js with canary v8 that supports recent Wasm GC changes // Node.js with canary v8 that supports recent Wasm GC changes
nodeVersion = "21.0.0-v8-canary20231019bd785be450" version = "21.0.0-v8-canary20231019bd785be450"
nodeDownloadBaseUrl = if (cacheRedirectorEnabled) downloadBaseUrl = if (cacheRedirectorEnabled)
"https://cache-redirector.jetbrains.com/nodejs.org/download/v8-canary" "https://cache-redirector.jetbrains.com/nodejs.org/download/v8-canary"
else else
"https://nodejs.org/download/v8-canary" "https://nodejs.org/download/v8-canary"
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-wasm-test/build.gradle.kts
+2 -2
View File
@@ -9,8 +9,8 @@ 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 recent Wasm GC changes // canary nodejs that supports recent Wasm GC changes
nodeVersion = "21.0.0-v8-canary20231019bd785be450" version = "21.0.0-v8-canary20231019bd785be450"
nodeDownloadBaseUrl = "https://nodejs.org/download/v8-canary" downloadBaseUrl = "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)) {
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-wasm-wasi-test/build.gradle.kts
+2 -2
View File
@@ -4,8 +4,8 @@ plugins {
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 recent Wasm GC changes // canary nodejs that supports recent Wasm GC changes
nodeVersion = "21.0.0-v8-canary20231019bd785be450" version = "21.0.0-v8-canary20231019bd785be450"
nodeDownloadBaseUrl = "https://nodejs.org/download/v8-canary" downloadBaseUrl = "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)) {
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsRootExtension.kt
+3 -6
View File
@@ -58,8 +58,7 @@ open class NodeJsRootExtension(
override var download by Property(true) override var download by Property(true)
// deprecate after bootstrap @Deprecated("Use downloadBaseUrl instead", ReplaceWith("downloadBaseUrl"))
// @Deprecated("Use downloadBaseUrl instead", ReplaceWith("downloadBaseUrl"))
var nodeDownloadBaseUrl var nodeDownloadBaseUrl
get() = downloadBaseUrl get() = downloadBaseUrl
set(value) { set(value) {
@@ -68,8 +67,7 @@ open class NodeJsRootExtension(
override var downloadBaseUrl: String? by Property("https://nodejs.org/dist") 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 var nodeVersion
get() = version get() = version
set(value) { set(value) {
@@ -83,8 +81,7 @@ open class NodeJsRootExtension(
override var command by Property("node") override var command by Property("node")
// deprecate after bootstrap @Deprecated("Use command instead", ReplaceWith("command"))
// @Deprecated("Use command instead", ReplaceWith("command"))
var nodeCommand var nodeCommand
get() = command get() = command
set(value) { set(value) {
repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/resolve-dependencies.gradle.kts
+5 -5
View File
@@ -59,13 +59,13 @@ tasks.register("resolveDependencies") {
rootProject.extensions.findByType<NodeJsRootExtension>()?.run { rootProject.extensions.findByType<NodeJsRootExtension>()?.run {
project.resolveDependencies( project.resolveDependencies(
"org.nodejs:node:$nodeVersion:linux-x64@tar.gz", "org.nodejs:node:$version:linux-x64@tar.gz",
"org.nodejs:node:$nodeVersion:win-x64@zip", "org.nodejs:node:$version:win-x64@zip",
"org.nodejs:node:$nodeVersion:darwin-x64@tar.gz", "org.nodejs:node:$version:darwin-x64@tar.gz",
"org.nodejs:node:$nodeVersion:darwin-arm64@tar.gz" "org.nodejs:node:$version:darwin-arm64@tar.gz"
) { ) {
ivy { ivy {
url = URI(nodeDownloadBaseUrl) url = URI(downloadBaseUrl)
patternLayout { patternLayout {
artifact("v[revision]/[artifact](-v[revision]-[classifier]).[ext]") artifact("v[revision]/[artifact](-v[revision]-[classifier]).[ext]")
} }