summaryrefslogtreecommitdiff
path: root/integration
diff options
context:
space:
mode:
authorLi Haoyi <haoyi.sg@gmail.com>2018-01-07 22:38:17 -0800
committerLi Haoyi <haoyi.sg@gmail.com>2018-01-07 22:38:17 -0800
commit4fd5f8cdfdc924bff2f4fbc6b5d7072d530fa531 (patch)
tree6e7c85efc2b3e59f56e1d207a42dda459243982b /integration
parenta30db9485048e8d6e260d5d506894bd6b41f1d72 (diff)
downloadmill-4fd5f8cdfdc924bff2f4fbc6b5d7072d530fa531.tar.gz
mill-4fd5f8cdfdc924bff2f4fbc6b5d7072d530fa531.tar.bz2
mill-4fd5f8cdfdc924bff2f4fbc6b5d7072d530fa531.zip
Generate the `Segments` list at definition time rather than discovery time, by propagating implicits throughout the tree of nested `mill.Module`s
This currently adds some annoying boilerplate to the definition of cross/abstract modules, which can probably be removed using Macros. The `Segments` mapping generated by discovery is still present and used in a few places, though it will be removed
Diffstat (limited to 'integration')
-rw-r--r--integration/src/test/resources/acyclic/build.sc2
-rw-r--r--integration/src/test/resources/jawn/build.sc2
2 files changed, 2 insertions, 2 deletions
diff --git a/integration/src/test/resources/acyclic/build.sc b/integration/src/test/resources/acyclic/build.sc
index f1381c7e..91468ad8 100644
--- a/integration/src/test/resources/acyclic/build.sc
+++ b/integration/src/test/resources/acyclic/build.sc
@@ -4,7 +4,7 @@ import mill.scalalib.{SbtModule, PublishModule, Dep}
import mill.scalalib.publish.{PomSettings, License, Developer, SCM}
object acyclic extends CrossModule(AcyclicModule, "2.10.6", "2.11.8", "2.12.3", "2.12.4")
-case class AcyclicModule(crossVersion: String) extends SbtModule with PublishModule {
+case class AcyclicModule(crossVersion: String, ctx0: Module.Ctx) extends Module()(ctx0) with SbtModule with PublishModule {
def basePath = super.basePath / ammonite.ops.up
def artifactName = "acyclic"
def publishVersion = "0.1.7"
diff --git a/integration/src/test/resources/jawn/build.sc b/integration/src/test/resources/jawn/build.sc
index 074e30f9..c306196c 100644
--- a/integration/src/test/resources/jawn/build.sc
+++ b/integration/src/test/resources/jawn/build.sc
@@ -3,7 +3,7 @@ import mill.CrossModule
import mill.scalalib.{Dep, TestModule, Module}
object jawn extends CrossModule(JawnModule, "2.10.6", "2.11.11", "2.12.3")
-case class JawnModule(crossVersion: String) extends mill.Module{
+case class JawnModule(crossVersion: String, ctx0: mill.Module.Ctx) extends mill.Module()(ctx0) {
override def basePath = super.basePath / ammonite.ops.up
trait JawnModule extends scalalib.SbtModule{