From ec39948ed1333699daf246e2ba37ccec67db5bd2 Mon Sep 17 00:00:00 2001 From: Li Haoyi Date: Sat, 3 Feb 2018 19:16:23 -0800 Subject: 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` --- scalalib/src/mill/scalalib/MiscModule.scala | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'scalalib/src') 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( -- cgit v1.2.3