From ff6515a263ece57622ff564f1a11cdd4ed07a754 Mon Sep 17 00:00:00 2001
From: Ilya Matveev <ilya.matveev@jetbrains.com>
Date: Tue, 19 Sep 2017 14:58:40 +0300
Subject: [PATCH] gradle-plugin: Improve parameter dumping

 #KT-20191 Fixed
---
 .../kotlin/gradle/plugin/KonanPlugin.kt         | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanPlugin.kt b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanPlugin.kt
index 8639ba58d7c..1ac77dce1f5 100644
--- a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanPlugin.kt
+++ b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanPlugin.kt
@@ -144,6 +144,9 @@ internal fun MutableList<String>.addListArg(parameter: String, values: List<Stri
 }
 
 internal fun dumpProperties(task: Task) {
+    fun Collection<FileCollection>.dump() = flatMap { it.files }.joinToString(prefix = "[",
+            separator = ",\n${" ".repeat(22)}", postfix = "]")
+
     when (task) {
         is KonanCompileTask -> {
             println()
@@ -151,10 +154,10 @@ internal fun dumpProperties(task: Task) {
             println("outputDir          : ${task.outputDir}")
             println("artifact           : ${task.artifact}")
             println("artifactPath       : ${task.artifactPath}")
-            println("inputFiles         : ${task.inputFiles.joinToString(prefix = "[", separator = ", ", postfix = "]")}")
+            println("inputFiles         : ${task.inputFiles.dump()}")
             println("produce            : ${task.produce}")
-            println("libraries          : ${task.libraries}")
-            println("nativeLibraries    : ${task.nativeLibraries}")
+            println("libraries          : ${task.libraries.dump()}")
+            println("nativeLibraries    : ${task.nativeLibraries.dump()}")
             println("linkerOpts         : ${task.linkerOpts}")
             println("enableDebug        : ${task.enableDebug}")
             println("noStdLib           : ${task.noStdLib}")
@@ -164,6 +167,8 @@ internal fun dumpProperties(task: Task) {
             println("target             : ${task.target}")
             println("languageVersion    : ${task.languageVersion}")
             println("apiVersion         : ${task.apiVersion}")
+            println("konanVersion       : ${task.konanVersion}")
+            println("konanHome          : ${task.konanHome}")
             println()
         }
         is KonanInteropTask -> {
@@ -176,8 +181,10 @@ internal fun dumpProperties(task: Task) {
             println("pkg                : ${task.pkg}")
             println("compilerOpts       : ${task.compilerOpts}")
             println("linkerOpts         : ${task.linkerOpts}")
-            println("headers            : ${task.headers.joinToString(prefix = "[", separator = ", ", postfix = "]")}")
-            println("linkFiles          : ${task.linkFiles}")
+            println("headers            : ${task.headers.dump()}")
+            println("linkFiles          : ${task.linkFiles.dump()}")
+            println("konanVersion       : ${task.konanVersion}")
+            println("konanHome          : ${task.konanHome}")
             println()
         }
         else -> {