From 40574949c746160725f7e41ddc8ccbda0cda35d0 Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Mon, 23 Oct 2017 01:41:49 +0300
Subject: [PATCH] Postpone some task configuration to execution phase

---
 libraries/stdlib/js/build.gradle                    |  6 ++++--
 libraries/tools/kotlin-reflect/build.gradle         |  2 +-
 prepare/compiler-client-embeddable/build.gradle.kts | 10 ++++++----
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/libraries/stdlib/js/build.gradle b/libraries/stdlib/js/build.gradle
index 7e92b77f7b2..1ee8c4769ec 100644
--- a/libraries/stdlib/js/build.gradle
+++ b/libraries/stdlib/js/build.gradle
@@ -159,8 +159,10 @@ task compileJs(type: JavaExec) {
     }
 
     main = "org.jetbrains.kotlin.js.FileMergerKt"
-    args = [jsOutputFile, rootDir, "$jsSrcDir/wrapper.js"] + inputFiles.collect { it.path } +
-           ["$buildDir/classes/builtins/kotlin.js", "$buildDir/classes/main/kotlin.js"]
+    doFirst {
+        args = [jsOutputFile, rootDir, "$jsSrcDir/wrapper.js"] + inputFiles.collect { it.path } +
+               ["$buildDir/classes/builtins/kotlin.js", "$buildDir/classes/main/kotlin.js"]
+    }
     classpath = configurations.merger
 
     doLast {
diff --git a/libraries/tools/kotlin-reflect/build.gradle b/libraries/tools/kotlin-reflect/build.gradle
index ab3cc846fde..f61ec1d144b 100644
--- a/libraries/tools/kotlin-reflect/build.gradle
+++ b/libraries/tools/kotlin-reflect/build.gradle
@@ -127,7 +127,7 @@ task proguard(type: proguard.gradle.ProGuardTask) {
     injars stripMetadata.outputs.files
     outjars outputJarPath
 
-    libraryjars configurations.proguardDeps.files
+    libraryjars configurations.proguardDeps
     libraryjars rtJar
 
     configuration "${core}/reflection.jvm/reflection.pro"
diff --git a/prepare/compiler-client-embeddable/build.gradle.kts b/prepare/compiler-client-embeddable/build.gradle.kts
index 7d6c583ba14..a8ee43e850d 100644
--- a/prepare/compiler-client-embeddable/build.gradle.kts
+++ b/prepare/compiler-client-embeddable/build.gradle.kts
@@ -53,10 +53,12 @@ sourceSets {
 projectTest {
     dependsOnTaskIfExistsRec("dist", project = rootProject)
     workingDir = File(rootDir, "libraries/tools/kotlin-compiler-client-embeddable-test/src")
-    systemProperty("kotlin.test.script.classpath", the<JavaPluginConvention>().sourceSets.getByName("test").output.classesDirs.joinToString(File.pathSeparator))
-    systemProperty("compilerJar", testRuntimeCompilerJar.singleFile.canonicalPath)
-    systemProperty("stdlibJar", testStdlibJar.singleFile.canonicalPath)
-    systemProperty("scriptRuntimeJar", testScriptRuntimeJar.singleFile.canonicalPath)
+    doFirst {
+        systemProperty("kotlin.test.script.classpath", the<JavaPluginConvention>().sourceSets.getByName("test").output.classesDirs.joinToString(File.pathSeparator))
+        systemProperty("compilerJar", testRuntimeCompilerJar.singleFile.canonicalPath)
+        systemProperty("stdlibJar", testStdlibJar.singleFile.canonicalPath)
+        systemProperty("scriptRuntimeJar", testScriptRuntimeJar.singleFile.canonicalPath)
+    }
 }
 
 archives.artifacts.let { artifacts ->