diff options
| author | Li Haoyi <haoyi.sg@gmail.com> | 2018-02-03 19:16:23 -0800 |
|---|---|---|
| committer | Li Haoyi <haoyi.sg@gmail.com> | 2018-02-03 19:16:23 -0800 |
| commit | ec39948ed1333699daf246e2ba37ccec67db5bd2 (patch) | |
| tree | a9d46242337543bcf589c33a596e7edf91b64664 /scalalib/src | |
| parent | 6fa39162250c2477b3c9d322c453dfd51646245b (diff) | |
| download | mill-ec39948ed1333699daf246e2ba37ccec67db5bd2.tar.gz mill-ec39948ed1333699daf246e2ba37ccec67db5bd2.tar.bz2 mill-ec39948ed1333699daf246e2ba37ccec67db5bd2.zip | |
Make use of `CrossScalaModule` in `HelloWorldTests`
Also standardize the `HelloWorldTests` onto the typical project layout, where the module of interest is nested within a top-level `BaseModule`
Diffstat (limited to 'scalalib/src')
| -rw-r--r-- | scalalib/src/mill/scalalib/MiscModule.scala | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scalalib/src/mill/scalalib/MiscModule.scala b/scalalib/src/mill/scalalib/MiscModule.scala index 440b7dcd..e4d8a8b0 100644 --- a/scalalib/src/mill/scalalib/MiscModule.scala +++ b/scalalib/src/mill/scalalib/MiscModule.scala @@ -14,6 +14,8 @@ object CrossModuleBase{ } trait CrossModuleBase extends mill.Module{ def crossScalaVersion: String + def scalaVersion = T{ crossScalaVersion } + override def millSourcePath = super.millSourcePath / ammonite.ops.up implicit def crossSbtModuleResolver: Resolver[CrossModuleBase] = new Resolver[CrossModuleBase]{ def resolve[V <: CrossModuleBase](c: Cross[V]): V = { @@ -71,7 +73,6 @@ trait SbtModule extends ScalaModule { outer => trait CrossSbtModule extends SbtModule with CrossModuleBase{ outer => - def scalaVersion = crossScalaVersion override def sources = T.input{ super.sources() ++ CrossModuleBase.scalaVersionPaths( |