diff options
| author | Li Haoyi <haoyi.sg@gmail.com> | 2017-12-04 23:30:11 -0800 |
|---|---|---|
| committer | Li Haoyi <haoyi.sg@gmail.com> | 2017-12-04 23:34:22 -0800 |
| commit | 395a856d91b318957963ab24011862653452a101 (patch) | |
| tree | a3472871359e026a1d05bef9c65e8b817d7c8ef8 /scalaplugin | |
| parent | 9aed4601a04a48b3192d1871ff0ebb98fa352726 (diff) | |
| download | mill-395a856d91b318957963ab24011862653452a101.tar.gz mill-395a856d91b318957963ab24011862653452a101.tar.bz2 mill-395a856d91b318957963ab24011862653452a101.zip | |
Avoid `inheritIO` in `Jvm.subprocess`, and instead feed it into the proper `log.outputStream`
Diffstat (limited to 'scalaplugin')
| -rw-r--r-- | scalaplugin/src/main/scala/mill/scalaplugin/ScalaModule.scala | 6 |
1 files changed, 3 insertions, 3 deletions
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){ |