diff options
author | Li Haoyi <haoyi.sg@gmail.com> | 2018-11-05 21:35:31 +0800 |
---|---|---|
committer | Li Haoyi <haoyi.sg@gmail.com> | 2018-11-05 23:31:01 +0800 |
commit | 2e2296fc47453785dd5a3e3ca3086584ea290194 (patch) | |
tree | 73c2a08f1d2197abb3b7cf3332489768747bc41c /scalalib | |
parent | bc9dc386625021fec517f2dbf0644ccafe1e32c2 (diff) | |
download | mill-2e2296fc47453785dd5a3e3ca3086584ea290194.tar.gz mill-2e2296fc47453785dd5a3e3ca3086584ea290194.tar.bz2 mill-2e2296fc47453785dd5a3e3ca3086584ea290194.zip |
fix assembly path handling, swap out Jvm.scala's custom subprocess handling with os.proc
Diffstat (limited to 'scalalib')
-rw-r--r-- | scalalib/src/mill/scalalib/JavaModule.scala | 10 | ||||
-rw-r--r-- | scalalib/src/mill/scalalib/ScalaModule.scala | 6 | ||||
-rw-r--r-- | scalalib/src/mill/scalalib/scalafmt/ScalafmtWorker.scala | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/scalalib/src/mill/scalalib/JavaModule.scala b/scalalib/src/mill/scalalib/JavaModule.scala index 387011ec..53677c53 100644 --- a/scalalib/src/mill/scalalib/JavaModule.scala +++ b/scalalib/src/mill/scalalib/JavaModule.scala @@ -400,7 +400,7 @@ trait JavaModule extends mill.Module with TaskModule { outer => * Runs this module's code in a subprocess and waits for it to finish */ def run(args: String*) = T.command{ - try Result.Success(Jvm.interactiveSubprocess( + try Result.Success(Jvm.runSubprocess( finalMainClass(), runClasspath().map(_.path), forkArgs(), @@ -458,7 +458,7 @@ trait JavaModule extends mill.Module with TaskModule { outer => */ def runBackground(args: String*) = T.command{ val (procId, procTombstone, token) = backgroundSetup(T.ctx().dest) - try Result.Success(Jvm.interactiveSubprocess( + try Result.Success(Jvm.runSubprocess( "mill.scalalib.backgroundwrapper.BackgroundWrapper", (runClasspath() ++ zincWorker.backgroundWrapperClasspath()).map(_.path), forkArgs(), @@ -476,7 +476,7 @@ trait JavaModule extends mill.Module with TaskModule { outer => */ def runMainBackground(mainClass: String, args: String*) = T.command{ val (procId, procTombstone, token) = backgroundSetup(T.ctx().dest) - try Result.Success(Jvm.interactiveSubprocess( + try Result.Success(Jvm.runSubprocess( "mill.scalalib.backgroundwrapper.BackgroundWrapper", (runClasspath() ++ zincWorker.backgroundWrapperClasspath()).map(_.path), forkArgs(), @@ -504,7 +504,7 @@ trait JavaModule extends mill.Module with TaskModule { outer => * Same as `run`, but lets you specify a main class to run */ def runMain(mainClass: String, args: String*) = T.command{ - try Result.Success(Jvm.interactiveSubprocess( + try Result.Success(Jvm.runSubprocess( mainClass, runClasspath().map(_.path), forkArgs(), @@ -545,7 +545,7 @@ trait TestModule extends JavaModule with TaskModule { def test(args: String*) = T.command{ val outputPath = T.ctx().dest/"out.json" - Jvm.subprocess( + Jvm.runSubprocess( mainClass = "mill.scalalib.TestRunner", classPath = zincWorker.scalalibClasspath().map(_.path), jvmArgs = forkArgs(), diff --git a/scalalib/src/mill/scalalib/ScalaModule.scala b/scalalib/src/mill/scalalib/ScalaModule.scala index 80caf6a9..38a5a8ea 100644 --- a/scalalib/src/mill/scalalib/ScalaModule.scala +++ b/scalalib/src/mill/scalalib/ScalaModule.scala @@ -5,7 +5,7 @@ import coursier.Repository import mill.define.{Target, Task, TaskModule} import mill.eval.{PathRef, Result} import mill.modules.Jvm -import mill.modules.Jvm.{createJar, subprocess} +import mill.modules.Jvm.createJar import Dep.isDotty import Lib._ import mill.util.Loose.Agg @@ -206,7 +206,7 @@ trait ScalaModule extends JavaModule { outer => if (T.ctx().log.inStream == DummyInputStream){ Result.Failure("repl needs to be run with the -i/--interactive flag") }else{ - Jvm.interactiveSubprocess( + Jvm.runSubprocess( mainClass = if (isDotty(scalaVersion())) "dotty.tools.repl.Main" @@ -241,7 +241,7 @@ trait ScalaModule extends JavaModule { outer => if (T.ctx().log.inStream == DummyInputStream){ Result.Failure("repl needs to be run with the -i/--interactive flag") }else{ - Jvm.interactiveSubprocess( + Jvm.runSubprocess( mainClass = "ammonite.Main", classPath = ammoniteReplClasspath().map(_.path), mainArgs = replOptions, diff --git a/scalalib/src/mill/scalalib/scalafmt/ScalafmtWorker.scala b/scalalib/src/mill/scalalib/scalafmt/ScalafmtWorker.scala index 41fad45b..d6992fc8 100644 --- a/scalalib/src/mill/scalalib/scalafmt/ScalafmtWorker.scala +++ b/scalalib/src/mill/scalalib/scalafmt/ScalafmtWorker.scala @@ -47,7 +47,7 @@ private[scalafmt] class ScalafmtWorker { classpath: Agg[os.Path])(implicit ctx: Ctx) = { val configFlags = if (os.exists(config)) Seq("--config", config.toString) else Seq.empty - Jvm.subprocess( + Jvm.runSubprocess( "org.scalafmt.cli.Cli", classpath, mainArgs = toFormat.map(_.toString) ++ configFlags ++ cliFlags |