[Gradle, JS] Fix node.js repository declaration

^KT-47557 fixed

libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsEnv.kt

@@ -11,7 +11,8 @@ data class NodeJsEnv(
 
     val platformName: String,
     val architectureName: String,
-    val ivyDependency: String
+    val ivyDependency: String,
+    val downloadBaseUrl: String
 ) {
     val isWindows: Boolean
         get() = platformName == "win"

libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsRootExtension.kt

@@ -110,7 +110,8 @@ open class NodeJsRootExtension(@Transient val rootProject: Project) : Configurat
             nodeExecutable = getExecutable("node", nodeCommand, "exe"),
             platformName = platform,
             architectureName = architecture,
-            ivyDependency = getIvyDependency()
+            ivyDependency = getIvyDependency(),
+            downloadBaseUrl = nodeDownloadBaseUrl
         )
     }
 

libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsSetupTask.kt

@@ -28,6 +28,9 @@ abstract class NodeJsSetupTask : DefaultTask() {
     val ivyDependency: String
         @Input get() = env.ivyDependency
 
+    val downloadBaseUrl: String
+        @Input get() = env.downloadBaseUrl
+
     val destination: File
         @OutputDirectory get() = env.nodeDir
 
@@ -41,30 +44,27 @@ abstract class NodeJsSetupTask : DefaultTask() {
 
     @Suppress("unused") // as it called by Gradle before task execution and used to resolve artifact
     @get:Classpath
-    val nodeJsDist: File
+    val nodeJsDist: File by lazy {
-        get() {
+        val repo = project.repositories.ivy { repo ->
-            @Suppress("UnstableApiUsage", "DEPRECATION")
+            repo.name = "Node Distributions at ${downloadBaseUrl}"
-            val repo = project.repositories.ivy { repo ->
+            repo.url = URI(downloadBaseUrl)
-                repo.name = "Node Distributions at ${settings.nodeDownloadBaseUrl}"
-                repo.url = URI(settings.nodeDownloadBaseUrl)
 
-                repo.patternLayout {
+            repo.patternLayout {
-                    it.artifact("v[revision]/[artifact](-v[revision]-[classifier]).[ext]")
+                it.artifact("v[revision]/[artifact](-v[revision]-[classifier]).[ext]")
-                    it.ivy("v[revision]/ivy.xml")
-                }
-                repo.metadataSources { it.artifact() }
-                repo.content { it.includeModule("org.nodejs", "node") }
             }
-            val startDownloadTime = System.currentTimeMillis()
+            repo.metadataSources { it.artifact() }
-            val dist = _nodeJsDist
+            repo.content { it.includeModule("org.nodejs", "node") }
-            val downloadDuration = System.currentTimeMillis() - startDownloadTime
-            if (downloadDuration > 0) {
-                KotlinBuildStatsService.getInstance()
-                    ?.report(NumericalMetrics.ARTIFACTS_DOWNLOAD_SPEED, dist.length() * 1000 / downloadDuration)
-            }
-            project.repositories.remove(repo)
-            return dist
         }
+        val startDownloadTime = System.currentTimeMillis()
+        val dist = _nodeJsDist
+        val downloadDuration = System.currentTimeMillis() - startDownloadTime
+        if (downloadDuration > 0) {
+            KotlinBuildStatsService.getInstance()
+                ?.report(NumericalMetrics.ARTIFACTS_DOWNLOAD_SPEED, dist.length() * 1000 / downloadDuration)
+        }
+        project.repositories.remove(repo)
+        dist
+    }
 
     init {
         @Suppress("LeakingThis")
@@ -76,9 +76,9 @@ abstract class NodeJsSetupTask : DefaultTask() {
     @Suppress("unused")
     @TaskAction
     fun exec() {
-        logger.kotlinInfo("Using node distribution from '$_nodeJsDist'")
+        logger.kotlinInfo("Using node distribution from '$nodeJsDist'")
 
-        unpackNodeArchive(_nodeJsDist, destination.parentFile) // parent because archive contains name already
+        unpackNodeArchive(nodeJsDist, destination.parentFile) // parent because archive contains name already
 
         if (!env.isWindows) {
             File(env.nodeExecutable).setExecutable(true)