summaryrefslogtreecommitdiff
path: root/scalalib/src
diff options
context:
space:
mode:
authorLi Haoyi <haoyi.sg@gmail.com>2018-02-17 11:53:48 -0800
committerLi Haoyi <haoyi.sg@gmail.com>2018-02-17 11:53:48 -0800
commit865045540bd80bebb1655005abf32bc089c33895 (patch)
tree694178964ec1f8f8af821f854655865cd9cd8612 /scalalib/src
parent92edcae5094e52783f825021e4172a6b072300e0 (diff)
parent4cae6ff8a1111bb6c4bc6a44e67bd0affdbb9792 (diff)
downloadmill-865045540bd80bebb1655005abf32bc089c33895.tar.gz
mill-865045540bd80bebb1655005abf32bc089c33895.tar.bz2
mill-865045540bd80bebb1655005abf32bc089c33895.zip
Merge branch '130'
Diffstat (limited to 'scalalib/src')
-rw-r--r--scalalib/src/mill/scalalib/ScalaModule.scala14
-rw-r--r--scalalib/src/mill/scalalib/ScalaWorkerApi.scala2
2 files changed, 15 insertions, 1 deletions
diff --git a/scalalib/src/mill/scalalib/ScalaModule.scala b/scalalib/src/mill/scalalib/ScalaModule.scala
index 390672c6..05c34249 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]
}