diff options
| author | Li Haoyi <haoyi.sg@gmail.com> | 2018-01-12 21:27:41 -0800 |
|---|---|---|
| committer | Li Haoyi <haoyi.sg@gmail.com> | 2018-01-12 21:27:41 -0800 |
| commit | cde65b142ca4c356134350525775d631015799ee (patch) | |
| tree | cb679755c916e4fad137b684bb86c74dee4ac716 /scalalib | |
| parent | 9cc010127b0b631c838db666200f293d0cf9ac37 (diff) | |
| download | mill-cde65b142ca4c356134350525775d631015799ee.tar.gz mill-cde65b142ca4c356134350525775d631015799ee.tar.bz2 mill-cde65b142ca4c356134350525775d631015799ee.zip | |
Allow `Cross`-builds to themselves be `Module`s so you can nest stuff inside
Also properly propagate `mainClass` into `assembly`
Diffstat (limited to 'scalalib')
| -rw-r--r-- | scalalib/src/main/scala/mill/scalalib/Module.scala | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/scalalib/src/main/scala/mill/scalalib/Module.scala b/scalalib/src/main/scala/mill/scalalib/Module.scala index a6819435..d3120721 100644 --- a/scalalib/src/main/scala/mill/scalalib/Module.scala +++ b/scalalib/src/main/scala/mill/scalalib/Module.scala @@ -218,6 +218,7 @@ trait Module extends mill.Module with TaskModule { outer => def assembly = T{ createAssembly( runClasspath().map(_.path).filter(exists), + mainClass(), prependShellScript = prependShellScript() ) } @@ -376,6 +377,7 @@ trait SbtModule extends Module { outer => } trait CrossSbtModule extends SbtModule { outer => + override def basePath = super.basePath / ammonite.ops.up implicit def crossSbtModuleResolver: Resolver[CrossSbtModule] = new Resolver[CrossSbtModule]{ def resolve[V <: CrossSbtModule](c: Cross[V]): V = { crossScalaVersion.split('.') |