diff options
| author | Li Haoyi <haoyi.sg@gmail.com> | 2018-01-08 00:19:46 -0800 |
|---|---|---|
| committer | Li Haoyi <haoyi.sg@gmail.com> | 2018-01-08 00:36:31 -0800 |
| commit | d037fcb99dfc94691783094d811cb60f2241aebb (patch) | |
| tree | 4b845eaadda65ca42dda0b7cb9f0c02842226d01 /integration | |
| parent | 5aa363015646644cc81afdf0120d8df441161e2d (diff) | |
| download | mill-d037fcb99dfc94691783094d811cb60f2241aebb.tar.gz mill-d037fcb99dfc94691783094d811cb60f2241aebb.tar.bz2 mill-d037fcb99dfc94691783094d811cb60f2241aebb.zip | |
Consolidate `Cross` and `CrossModule`, eliminate now-unused `map`/`flatMap`/`filter` APIs
Diffstat (limited to 'integration')
| -rw-r--r-- | integration/src/test/resources/acyclic/build.sc | 5 | ||||
| -rw-r--r-- | integration/src/test/resources/better-files/build.sc | 4 | ||||
| -rw-r--r-- | integration/src/test/resources/jawn/build.sc | 4 |
3 files changed, 5 insertions, 8 deletions
diff --git a/integration/src/test/resources/acyclic/build.sc b/integration/src/test/resources/acyclic/build.sc index 942a7c10..66d64501 100644 --- a/integration/src/test/resources/acyclic/build.sc +++ b/integration/src/test/resources/acyclic/build.sc @@ -1,9 +1,8 @@ -import mill.define.Cross -import mill.CrossModule +import mill.Cross 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") +object acyclic extends Cross[AcyclicModule]("2.10.6", "2.11.8", "2.12.3", "2.12.4") class AcyclicModule(crossVersion: String) extends SbtModule with PublishModule { def basePath = super.basePath / ammonite.ops.up def artifactName = "acyclic" diff --git a/integration/src/test/resources/better-files/build.sc b/integration/src/test/resources/better-files/build.sc index ace8f766..cd6cac04 100644 --- a/integration/src/test/resources/better-files/build.sc +++ b/integration/src/test/resources/better-files/build.sc @@ -1,6 +1,4 @@ -import mill.define.Cross -import mill.scalalib.{SbtModule, PublishModule, Dep} -import mill.scalalib.publish.{PomSettings, License, Developer, SCM} +import mill.scalalib.{SbtModule, Dep} trait BetterFilesModule extends SbtModule{ def scalaVersion = "2.12.4" diff --git a/integration/src/test/resources/jawn/build.sc b/integration/src/test/resources/jawn/build.sc index 67b60f05..8b830f70 100644 --- a/integration/src/test/resources/jawn/build.sc +++ b/integration/src/test/resources/jawn/build.sc @@ -1,8 +1,8 @@ import mill.scalalib -import mill.CrossModule +import mill.Cross import mill.scalalib.{Dep, TestModule, Module} -object jawn extends CrossModule[JawnModule]("2.10.6", "2.11.11", "2.12.3") +object jawn extends Cross[JawnModule]("2.10.6", "2.11.11", "2.12.3") class JawnModule(crossVersion: String) extends mill.Module{ override def basePath = super.basePath / ammonite.ops.up |