From 73f6316f2754578c41aaedf8f6eec4bcd4e2a768 Mon Sep 17 00:00:00 2001
From: Yahor Berdnikau <yahor.berdnikau@jetbrains.com>
Date: Mon, 3 Jul 2023 10:26:29 +0200
Subject: [PATCH] [repo] Enable warnings as errors for Gradle Kotlin scripts

---
 buildSrc/gradle.properties                         | 1 +
 gradle.properties                                  | 1 +
 js/js.tests/build.gradle.kts                       | 7 ++-----
 libraries/kotlin.test/js-ir/it/build.gradle.kts    | 4 ++--
 libraries/stdlib/js-ir/build.gradle.kts            | 4 ++--
 repo/gradle-settings-conventions/gradle.properties | 4 +++-
 6 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/buildSrc/gradle.properties b/buildSrc/gradle.properties
index a375736226d..55c5c3a7d2c 100644
--- a/buildSrc/gradle.properties
+++ b/buildSrc/gradle.properties
@@ -1,4 +1,5 @@
 org.gradle.jvmargs=-Duser.country=US -Dfile.encoding=UTF-8
+org.gradle.kotlin.dsl.allWarningsAsErrors=true
 
 cacheRedirectorEnabled=true
 
diff --git a/gradle.properties b/gradle.properties
index 582fa9bbc12..da6684b7a0e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -7,6 +7,7 @@ kotlin.incremental.useClasspathSnapshot=true
 
 org.gradle.parallel=true
 org.gradle.caching=true
+org.gradle.kotlin.dsl.allWarningsAsErrors=true
 
 # Please keep it in sync with buildSrc gradle.properties.
 # It's currently needed for proper configuration cache work, the reason will be investigated later
diff --git a/js/js.tests/build.gradle.kts b/js/js.tests/build.gradle.kts
index 22c16d4294b..688008e7ba3 100644
--- a/js/js.tests/build.gradle.kts
+++ b/js/js.tests/build.gradle.kts
@@ -1,4 +1,5 @@
 import com.github.gradle.node.npm.task.NpmTask
+import com.github.gradle.node.variant.computeNodeExec
 import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinUsages
 import org.jetbrains.kotlin.ideaExt.idea
@@ -214,11 +215,7 @@ val generateTypeScriptJsExportOnFileTests by parallel(
 fun Test.setupNodeJs() {
     systemProperty("javascript.engine.path.NodeJs", com.github.gradle.node.variant.VariantComputer()
         .let { variantComputer ->
-            variantComputer
-                .computeNodeDir(node)
-                .let { variantComputer.computeNodeBinDir(it) }
-                .let { variantComputer.computeNodeExec(node, it) }
-                .get()
+            computeNodeExec(node, variantComputer.computeNodeBinDir(node.computedNodeDir)).get()
         }
     )
 }
diff --git a/libraries/kotlin.test/js-ir/it/build.gradle.kts b/libraries/kotlin.test/js-ir/it/build.gradle.kts
index 8c8d432c7c7..3598b33c2a3 100644
--- a/libraries/kotlin.test/js-ir/it/build.gradle.kts
+++ b/libraries/kotlin.test/js-ir/it/build.gradle.kts
@@ -31,9 +31,9 @@ val ignoreTestFailures by extra(project.kotlinBuildProperties.ignoreTestFailures
 kotlin {
     js(IR) {
         nodejs {
-            testTask {
+            testTask(Action {
                 enabled = false
-            }
+            })
         }
     }
 
diff --git a/libraries/stdlib/js-ir/build.gradle.kts b/libraries/stdlib/js-ir/build.gradle.kts
index aa66ed799aa..3e36db56abd 100644
--- a/libraries/stdlib/js-ir/build.gradle.kts
+++ b/libraries/stdlib/js-ir/build.gradle.kts
@@ -7,11 +7,11 @@ plugins {
 kotlin {
     js(IR) {
         nodejs {
-            testTask {
+            testTask(Action {
                 useMocha {
                     timeout = "10s"
                 }
-            }
+            })
         }
     }
 }
diff --git a/repo/gradle-settings-conventions/gradle.properties b/repo/gradle-settings-conventions/gradle.properties
index d135cea039a..c804cccb750 100644
--- a/repo/gradle-settings-conventions/gradle.properties
+++ b/repo/gradle-settings-conventions/gradle.properties
@@ -2,4 +2,6 @@ kotlin.build.gradlePlugin.version=0.0.39
 kotlin.options.suppressFreeCompilerArgsModificationWarning=true
 cacheRedirectorEnabled=true
 # Should be in sync with ":kotlin-daemon-config" project convention script configuration
-kotlin.daemon.jvmargs=-Xmx3g
\ No newline at end of file
+kotlin.daemon.jvmargs=-Xmx3g
+
+org.gradle.kotlin.dsl.allWarningsAsErrors=true