diff options
Diffstat (limited to 'scalaplugin')
-rw-r--r-- | scalaplugin/src/main/scala/mill/scalaplugin/ScalaModule.scala | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/scalaplugin/src/main/scala/mill/scalaplugin/ScalaModule.scala b/scalaplugin/src/main/scala/mill/scalaplugin/ScalaModule.scala index 4b6b7873..96716fff 100644 --- a/scalaplugin/src/main/scala/mill/scalaplugin/ScalaModule.scala +++ b/scalaplugin/src/main/scala/mill/scalaplugin/ScalaModule.scala @@ -7,7 +7,7 @@ import java.util.Optional import ammonite.ops._ import coursier.{Cache, Fetch, MavenRepository, Repository, Resolution} import mill.define.Task -import mill.define.Task.Module +import mill.define.Task.{Module, TaskModule} import mill.eval.{Evaluator, PathRef} import mill.modules.Jvm.{createAssembly, createJar} import mill.util.OSet @@ -169,9 +169,10 @@ object ScalaModule{ ) } import ScalaModule._ -trait TestScalaModule extends ScalaModule { +trait TestScalaModule extends ScalaModule with TaskModule { + override def defaultCommandName() = "test" def testFramework: T[String] - def run(args: String*) = T.command{ + def test(args: String*) = T.command{ TestRunner( testFramework(), runDepClasspath().map(_.path) :+ compile().path, @@ -180,7 +181,8 @@ trait TestScalaModule extends ScalaModule { ) } } -trait ScalaModule extends Module{ outer => +trait ScalaModule extends Module with TaskModule{ outer => + def defaultCommandName() = "run" trait Tests extends TestScalaModule{ def scalaVersion = outer.scalaVersion() override def projectDeps = Seq(outer) @@ -279,6 +281,11 @@ trait ScalaModule extends Module{ outer => PathRef(dest) } + def run(mainClass: String) = T.command{ + import ammonite.ops._, ImplicitWd._ + %('java, "-cp", (runDepClasspath().map(_.path) :+ compile().path).mkString(":"), mainClass) + } + def console() = T.command{ import ammonite.ops._, ImplicitWd._ %('java, |