Merge PR #189

Fix Maven resolver blocking on reading from stdio.

Author: fwcd

shared/src/main/kotlin/org/javacs/kt/classpath/MavenClassPathResolver.kt

@@ -2,6 +2,7 @@ package org.javacs.kt.classpath
 
 import org.javacs.kt.LOG
 import org.javacs.kt.util.findCommandOnPath
+import org.javacs.kt.util.execAndReadStdoutAndStderr
 import java.nio.file.Path
 import java.nio.file.Files
 import java.io.File
@@ -60,20 +61,14 @@ private fun mavenJarName(a: Artifact, source: Boolean) =
 
 private fun generateMavenDependencyList(pom: Path): Path {
     val mavenOutput = Files.createTempFile("deps", ".txt")
-    val workingDirectory = pom.toAbsolutePath().parent.toFile()
-    val cmd = "$mvnCommand dependency:list -DincludeScope=test -DoutputFile=$mavenOutput"
-    LOG.info("Run {} in {}", cmd, workingDirectory)
-    val process = Runtime.getRuntime().exec(cmd, null, workingDirectory)
-
-    process.inputStream.bufferedReader().use { reader ->
-        while (process.isAlive) {
-            val line = reader.readLine()?.trim() ?: break
-            if (line.isNotEmpty() && !line.startsWith("Progress")) {
-                LOG.info("Maven: {}", line)
-            }
-        }
+    val command = "$mvnCommand dependency:list -DincludeScope=test -DoutputFile=$mavenOutput"
+    val workingDirectory = pom.toAbsolutePath().parent
+    LOG.info("Run {} in {}", command, workingDirectory)
+    val (result, errors) = execAndReadStdoutAndStderr(command, workingDirectory)
+    LOG.debug(result)
+    if ("BUILD FAILURE" in errors) {
+        LOG.warn("Maven task failed: {}", errors.lines().firstOrNull())
     }
-
     return mavenOutput
 }
 

shared/src/main/kotlin/org/javacs/kt/classpath/WithStdlibResolver.kt

@@ -13,7 +13,10 @@ internal class WithStdlibResolver(private val wrapped: ClassPathResolver) : Clas
 
 private fun wrapWithStdlib(paths: Set<Path>): Set<Path> {
     // Ensure that there is exactly one kotlin-stdlib present, and/or exactly one of kotlin-stdlib-common, -jdk8, etc.
-    val isStdlib: ((Path) -> Boolean) = { it.toString().contains("kotlin-stdlib") }
+    val isStdlib: ((Path) -> Boolean) = {
+        val pathString = it.toString()
+        pathString.contains("kotlin-stdlib") && !pathString.contains("kotlin-stdlib-common")
+    }
 
     val linkedStdLibs = paths.filter(isStdlib)
         .mapNotNull { StdLibItem.from(it) }

shared/src/main/kotlin/org/javacs/kt/util/Utils.kt

@@ -17,8 +17,14 @@ fun execAndReadStdoutAndStderr(shellCommand: String, directory: Path): Pair<Stri
     val process = Runtime.getRuntime().exec(shellCommand, null, directory.toFile())
     val stdout = process.inputStream
     val stderr = process.errorStream
-    val output = stdout.bufferedReader().use { it.readText() }
-    val errors = stderr.bufferedReader().use { it.readText() }
+    var output = ""
+    var errors = ""
+    val outputThread = Thread { stdout.bufferedReader().use { output += it.readText() } }
+    val errorsThread = Thread { stderr.bufferedReader().use { errors += it.readText() } }
+    outputThread.start()
+    errorsThread.start()
+    outputThread.join()
+    errorsThread.join()
     return Pair(output, errors)
 }