Gradle, js, dsl: use ConfigureUtil.configure for Groovy compatibility

libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dsl/KotlinJsTargetDsl.kt

@@ -6,6 +6,7 @@
 package org.jetbrains.kotlin.gradle.targets.js.dsl
 
 import groovy.lang.Closure
+import org.gradle.util.ConfigureUtil
 import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsExec
 import org.jetbrains.kotlin.gradle.targets.js.testing.KotlinJsTest
 import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpack
@@ -15,8 +16,7 @@ interface KotlinJsTargetDsl {
     fun browser(body: KotlinJsBrowserDsl.() -> Unit)
     fun browser(fn: Closure<*>) {
         browser {
-            fn.delegate = this
+            ConfigureUtil.configure(fn, this)
-            fn.call()
         }
     }
 
@@ -24,8 +24,7 @@ interface KotlinJsTargetDsl {
     fun nodejs(body: KotlinJsNodeDsl.() -> Unit)
     fun nodejs(fn: Closure<*>) {
         nodejs {
-            fn.delegate = this
+            ConfigureUtil.configure(fn, this)
-            fn.call()
         }
     }
 }
@@ -34,8 +33,7 @@ interface KotlinJsSubTargetDsl {
     fun testTask(body: KotlinJsTest.() -> Unit)
     fun testTask(fn: Closure<*>) {
         testTask {
-            fn.delegate = this
+            ConfigureUtil.configure(fn, this)
-            fn.call()
         }
     }
 }
@@ -44,16 +42,14 @@ interface KotlinJsBrowserDsl : KotlinJsSubTargetDsl {
     fun runTask(body: KotlinWebpack.() -> Unit)
     fun runTask(fn: Closure<*>) {
         runTask {
-            fn.delegate = this
+            ConfigureUtil.configure(fn, this)
-            fn.call()
         }
     }
 
     fun webpackTask(body: KotlinWebpack.() -> Unit)
     fun webpackTask(fn: Closure<*>) {
         testTask {
-            fn.delegate = this
+            ConfigureUtil.configure(fn, this)
-            fn.call()
         }
     }
 }

libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/KotlinJsTest.kt

@@ -10,6 +10,7 @@ import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.Internal
 import org.gradle.api.tasks.SkipWhenEmpty
 import org.gradle.process.internal.DefaultProcessForkOptions
+import org.gradle.util.ConfigureUtil
 import org.jetbrains.kotlin.gradle.internal.testing.TCServiceMessagesTestExecutionSpec
 import org.jetbrains.kotlin.gradle.plugin.HasKotlinDependencies
 import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsPlugin
@@ -40,24 +41,21 @@ open class KotlinJsTest : KotlinTest(), RequiresNpmDependencies {
     fun useNodeJs(body: KotlinNodeJsTestRunner.() -> Unit) = use(KotlinNodeJsTestRunner(project), body)
     fun useNodeJs(fn: Closure<*>) {
         useNodeJs {
-            fn.delegate = this
+            ConfigureUtil.configure(fn, this)
-            fn.call()
         }
     }
 
     fun useMocha(body: KotlinMocha.() -> Unit) = use(KotlinMocha(project), body)
     fun useMocha(fn: Closure<*>) {
         useMocha {
-            fn.delegate = this
+            ConfigureUtil.configure(fn, this)
-            fn.call()
         }
     }
 
     fun useKarma(body: KotlinKarma.() -> Unit) = use(KotlinKarma(project), body)
     fun useKarma(fn: Closure<*>) {
         useKarma {
-            fn.delegate = this
+            ConfigureUtil.configure(fn, this)
-            fn.call()
         }
     }