From 395a856d91b318957963ab24011862653452a101 Mon Sep 17 00:00:00 2001 From: Li Haoyi Date: Mon, 4 Dec 2017 23:30:11 -0800 Subject: Avoid `inheritIO` in `Jvm.subprocess`, and instead feed it into the proper `log.outputStream` --- scalaplugin/src/main/scala/mill/scalaplugin/ScalaModule.scala | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'scalaplugin/src/main') diff --git a/scalaplugin/src/main/scala/mill/scalaplugin/ScalaModule.scala b/scalaplugin/src/main/scala/mill/scalaplugin/ScalaModule.scala index 292c41a6..472b8c03 100644 --- a/scalaplugin/src/main/scala/mill/scalaplugin/ScalaModule.scala +++ b/scalaplugin/src/main/scala/mill/scalaplugin/ScalaModule.scala @@ -53,10 +53,10 @@ object ScalaModule{ val outerClassLoader = getClass.getClassLoader val compilerJars = compilerClasspath.toArray.map(_.toIO) - + def binaryScalaVersion = scalaVersion.split('.').dropRight(1).mkString(".") val compilerBridgeJar = new java.io.File( -// s"bridge/${scalaVersion.replace('.', '_')}/target/scala-$binaryScalaVersion/mill-bridge_$scalaVersion-0.1-SNAPSHOT.jar" - s"out/bridges/$scalaVersion/compile/classes" + s"bridge/${scalaVersion.replace('.', '_')}/target/scala-$binaryScalaVersion/mill-bridge_$scalaVersion-0.1-SNAPSHOT.jar" +// s"out/bridges/$scalaVersion/compile/classes" ) val zincClassLoader = new URLClassLoader(compilerJars.map(_.toURI.toURL), null){ -- cgit v1.2.3