diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/exec.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/exec.kt index 5feef7ba1a7..b5e8735044a 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/exec.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/exec.kt @@ -13,7 +13,6 @@ import org.gradle.process.internal.ExecActionFactory import java.io.ByteArrayOutputStream import java.io.PipedInputStream import java.io.PipedOutputStream -import java.nio.CharBuffer import kotlin.concurrent.thread internal fun Project.execWithProgress(description: String, readStdErr: Boolean = false, body: (ExecAction) -> Unit): ExecResult { @@ -32,7 +31,7 @@ internal fun Project.execWithProgress(description: String, readStdErr: Boolean = val buffer = StringBuilder() while (true) { val read = reader.read() - if (read == -1) break; + if (read == -1) break val ch = read.toChar() if (ch == '\b' || ch == '\n' || ch == '\r') { if (buffer.isNotEmpty()) { @@ -55,7 +54,13 @@ internal fun Project.execWithProgress(description: String, readStdErr: Boolean = val result = exec.execute() outputReaderThread.join() if (result.exitValue != 0) { - error(stderr.toString() + "\n" + stdout) + error( + """ + Process '$description' returns ${result.exitValue} + $stderr + $stdout + """.trimIndent() + ) } result }