From 9de66c4165d8601bda8c590914585964c5142bc3 Mon Sep 17 00:00:00 2001
From: Alexey Tsvetkov <alexey.tsvetkov@jetbrains.com>
Date: Fri, 2 Nov 2018 00:06:27 +0300
Subject: [PATCH] Fix Gradle JS test with Gradle 4.0+

---
 .../testProject/kotlin2JsInternalTest/build.gradle        | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsInternalTest/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsInternalTest/build.gradle
index fdc12485ec3..5263392980b 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsInternalTest/build.gradle
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsInternalTest/build.gradle
@@ -20,9 +20,11 @@ dependencies {
     compile "org.mozilla:rhino:1.7.7.1"
 }
 
+def classesDir = "${buildDir}/classes/kotlin"
+
 task runRhino(type: JavaExec) {
     classpath = sourceSets.main.runtimeClasspath
-    workingDir = "${buildDir}/classes/"
+    workingDir = classesDir
     main = 'org.mozilla.javascript.tools.shell.Main'
     args = ["-opt", "-1", "-f", "kotlin.js", "-f", "main/kotlin2JsInternalTest.js", "-f", "test/kotlin2JsInternalTest_test.js", "-f", "check.js"]
 }
@@ -33,7 +35,7 @@ build.doLast {
             includeEmptyDirs = false
 
             from zipTree(file.absolutePath)
-            into "${buildDir}/classes/"
+            into classesDir
             include { fileTreeElement ->
                 def path = fileTreeElement.path
                 path.endsWith(".js") && (path.startsWith("META-INF/resources/") || !path.startsWith("META-INF/"))
@@ -43,7 +45,7 @@ build.doLast {
     copy {
         from "."
         include "check.js"
-        into "${buildDir}/classes/"
+        into classesDir
     }
 }