diff options
author | Nikolay Tatarinov <5min4eq.unity@gmail.com> | 2017-11-26 20:30:26 +0300 |
---|---|---|
committer | Li Haoyi <haoyi.sg@gmail.com> | 2017-11-26 09:30:26 -0800 |
commit | acecf20f25da2b0eb777ff08c5fad8712d4c3c72 (patch) | |
tree | 282abd821e833683d5fcfae85625c47fdfddfe92 /scalaplugin/src | |
parent | 39f38d4fd354ec70d4dcaf52a8804c8143b1c3f0 (diff) | |
download | mill-acecf20f25da2b0eb777ff08c5fad8712d4c3c72.tar.gz mill-acecf20f25da2b0eb777ff08c5fad8712d4c3c72.tar.bz2 mill-acecf20f25da2b0eb777ff08c5fad8712d4c3c72.zip |
fix console command in scala plugin; use subprocess for run (#21)
Diffstat (limited to 'scalaplugin/src')
-rw-r--r-- | scalaplugin/src/main/scala/mill/scalaplugin/ScalaModule.scala | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/scalaplugin/src/main/scala/mill/scalaplugin/ScalaModule.scala b/scalaplugin/src/main/scala/mill/scalaplugin/ScalaModule.scala index 96716fff..02f202de 100644 --- a/scalaplugin/src/main/scala/mill/scalaplugin/ScalaModule.scala +++ b/scalaplugin/src/main/scala/mill/scalaplugin/ScalaModule.scala @@ -8,9 +8,8 @@ import ammonite.ops._ import coursier.{Cache, Fetch, MavenRepository, Repository, Resolution} import mill.define.Task import mill.define.Task.{Module, TaskModule} -import mill.eval.{Evaluator, PathRef} -import mill.modules.Jvm.{createAssembly, createJar} -import mill.util.OSet +import mill.eval.PathRef +import mill.modules.Jvm.{createAssembly, createJar, subprocess} import sbt.internal.inc._ import sbt.internal.util.{ConsoleOut, MainAppender} import sbt.util.{InterfaceUtil, LogExchange} @@ -282,17 +281,14 @@ trait ScalaModule extends Module with TaskModule{ outer => } def run(mainClass: String) = T.command{ - import ammonite.ops._, ImplicitWd._ - %('java, "-cp", (runDepClasspath().map(_.path) :+ compile().path).mkString(":"), mainClass) + subprocess(mainClass, runDepClasspath().map(_.path) :+ compile().path) } def console() = T.command{ - import ammonite.ops._, ImplicitWd._ - %('java, - "-cp", - (runDepClasspath().map(_.path) :+ compile().path).mkString(":"), - "scala.tools.nsc.MainGenericRunner", - "-usejavacp" + subprocess( + mainClass = "scala.tools.nsc.MainGenericRunner", + classPath = externalCompileDepClasspath().map(_.path) :+ compile().path, + options = Seq("-usejavacp") ) } } |