summaryrefslogtreecommitdiff
path: root/scalalib
diff options
context:
space:
mode:
authorajrnz <richards.aj@gmail.com>2018-02-16 16:39:37 +0000
committerajrnz <richards.aj@gmail.com>2018-02-16 17:24:16 +0000
commit4cae6ff8a1111bb6c4bc6a44e67bd0affdbb9792 (patch)
tree525db19eb2b03f32b35e1bdc6e4329837c338875 /scalalib
parent7f2b6e2d5015654954376639706543502a377844 (diff)
downloadmill-4cae6ff8a1111bb6c4bc6a44e67bd0affdbb9792.tar.gz
mill-4cae6ff8a1111bb6c4bc6a44e67bd0affdbb9792.tar.bz2
mill-4cae6ff8a1111bb6c4bc6a44e67bd0affdbb9792.zip
Discover main class(es) via zinc
Diffstat (limited to 'scalalib')
-rw-r--r--scalalib/src/mill/scalalib/ScalaModule.scala14
-rw-r--r--scalalib/src/mill/scalalib/ScalaWorkerApi.scala2
-rw-r--r--scalalib/test/src/mill/scalalib/HelloWorldTests.scala31
3 files changed, 42 insertions, 5 deletions
diff --git a/scalalib/src/mill/scalalib/ScalaModule.scala b/scalalib/src/mill/scalalib/ScalaModule.scala
index b7810246..f0b2ca86 100644
--- a/scalalib/src/mill/scalalib/ScalaModule.scala
+++ b/scalalib/src/mill/scalalib/ScalaModule.scala
@@ -23,7 +23,19 @@ trait ScalaModule extends mill.Module with TaskModule { outer =>
override def moduleDeps = Seq(outer)
}
def scalaVersion: T[String]
- def mainClass: T[Option[String]] = None
+
+ def mainClass: T[Option[String]] = T{
+ discoverMainClasses() match {
+ case Seq(main) => Some(main)
+ case _ => None
+ }
+ }
+
+ def discoverMainClasses: T[Seq[String]] = T{
+ Task.traverse(transitiveModuleDeps){ module => T.task {
+ mill.scalalib.ScalaWorkerApi.scalaWorker().discoverMainClasses(module.compile())
+ }}().flatten.distinct
+ }
def ivyDeps = T{ Agg.empty[Dep] }
def compileIvyDeps = T{ Agg.empty[Dep] }
diff --git a/scalalib/src/mill/scalalib/ScalaWorkerApi.scala b/scalalib/src/mill/scalalib/ScalaWorkerApi.scala
index 03cd7d9d..ec2489af 100644
--- a/scalalib/src/mill/scalalib/ScalaWorkerApi.scala
+++ b/scalalib/src/mill/scalalib/ScalaWorkerApi.scala
@@ -62,4 +62,6 @@ trait ScalaWorkerApi {
testClassfilePath: Agg[Path],
args: Seq[String])
(implicit ctx: mill.util.Ctx.Log): (String, Seq[Result])
+
+ def discoverMainClasses(compilationResult: CompilationResult)(implicit ctx: mill.util.Ctx): Seq[String]
}
diff --git a/scalalib/test/src/mill/scalalib/HelloWorldTests.scala b/scalalib/test/src/mill/scalalib/HelloWorldTests.scala
index 1d39f180..945bec27 100644
--- a/scalalib/test/src/mill/scalalib/HelloWorldTests.scala
+++ b/scalalib/test/src/mill/scalalib/HelloWorldTests.scala
@@ -33,6 +33,15 @@ object HelloWorldTests extends TestSuite {
class HelloWorldCross(val crossScalaVersion: String) extends CrossScalaModule
}
+ object HelloWorldDefaultMain extends HelloBase {
+ object core extends HelloWorldModule
+ }
+
+ object HelloWorldWithoutMain extends HelloBase {
+ object core extends HelloWorldModule{
+ def mainClass = None
+ }
+ }
object HelloWorldWithMain extends HelloBase {
object core extends HelloWorldModule{
@@ -291,8 +300,8 @@ object HelloWorldTests extends TestSuite {
read(runResult) == "hello rockjam, your age is: 25"
)
}
- 'notRunWithoutMainClass - workspaceTest(HelloWorld){eval =>
- val Left(Result.Exception(err, _)) = eval.apply(HelloWorld.core.run())
+ 'notRunWithoutMainClass - workspaceTest(HelloWorldWithoutMain){eval =>
+ val Left(Result.Exception(err, _)) = eval.apply(HelloWorldWithoutMain.core.run())
assert(
err.isInstanceOf[RuntimeException]
@@ -314,8 +323,22 @@ object HelloWorldTests extends TestSuite {
read(runResult) == "hello rockjam, your age is: 25"
)
}
- 'notRunWithoutMainClass - workspaceTest(HelloWorld){eval =>
- val Left(Result.Exception(err, _)) = eval.apply(HelloWorld.core.runLocal())
+ 'runWithDefaultMain - workspaceTest(HelloWorldDefaultMain){eval =>
+ val runResult = eval.outPath / 'core / 'run / 'dest / "hello-mill"
+ val Right((_, evalCount)) = eval.apply(
+ HelloWorldDefaultMain.core.runLocal(runResult.toString)
+ )
+
+ assert(evalCount > 0)
+
+
+ assert(
+ exists(runResult),
+ read(runResult) == "hello rockjam, your age is: 25"
+ )
+ }
+ 'notRunWithoutMainClass - workspaceTest(HelloWorldWithoutMain){eval =>
+ val Left(Result.Exception(err, _)) = eval.apply(HelloWorldWithoutMain.core.runLocal())
assert(
err.isInstanceOf[RuntimeException]