diff options
author | Li Haoyi <haoyi.sg@gmail.com> | 2018-01-27 20:36:27 -0800 |
---|---|---|
committer | Li Haoyi <haoyi.sg@gmail.com> | 2018-01-27 20:37:57 -0800 |
commit | e754ec7d9eafdf13f9a34248295e19d309c7eba4 (patch) | |
tree | 9e05d00caf493b6aa9bbca5d5e91e37378966170 /integration/test/resources | |
parent | 8986f9755a026691d1839bac806b0b75c2e3e74d (diff) | |
download | mill-e754ec7d9eafdf13f9a34248295e19d309c7eba4.tar.gz mill-e754ec7d9eafdf13f9a34248295e19d309c7eba4.tar.bz2 mill-e754ec7d9eafdf13f9a34248295e19d309c7eba4.zip |
First incomplete pass at writing docs
Diffstat (limited to 'integration/test/resources')
-rw-r--r-- | integration/test/resources/ammonite/build.sc | 5 | ||||
-rw-r--r-- | integration/test/resources/jawn/build.sc | 5 |
2 files changed, 3 insertions, 7 deletions
diff --git a/integration/test/resources/ammonite/build.sc b/integration/test/resources/ammonite/build.sc index ebc264d4..4b8db461 100644 --- a/integration/test/resources/ammonite/build.sc +++ b/integration/test/resources/ammonite/build.sc @@ -150,11 +150,6 @@ class ShellModule(val crossScalaVersion: String) extends AmmModule{ object integration extends Cross[IntegrationModule](fullCrossScalaVersions:_*) class IntegrationModule(val crossScalaVersion: String) extends AmmModule{ def moduleDeps = Seq(ops(), amm()) - // (test in Test) := (test in Test).dependsOn(integrationTasks:_*).value, - // (run in Test) := (run in Test).dependsOn(integrationTasks:_*).evaluated, - // (testOnly in Test) := (testOnly in Test).dependsOn(integrationTasks:_*).evaluated, - // (console in Test) := (console in Test).dependsOn(integrationTasks:_*).value, - // initialCommands in (Test, console) := "ammonite.integration.Main.main(null)" object test extends Tests { def forkEnv = super.forkEnv() ++ Seq( "AMMONITE_TEST_SHELL" -> shell().jar().path.toString, diff --git a/integration/test/resources/jawn/build.sc b/integration/test/resources/jawn/build.sc index 4898a3cb..0c4bdfca 100644 --- a/integration/test/resources/jawn/build.sc +++ b/integration/test/resources/jawn/build.sc @@ -1,9 +1,10 @@ import mill.scalalib import mill.Cross import mill.scalalib.{Dep, TestModule, DepSyntax} +import ammonite.ops.up 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 / ammonite.ops.up + override def basePath = super.basePath / up / up trait JawnModule extends scalalib.SbtModule{ def scalaVersion = crossVersion @@ -52,7 +53,7 @@ class JawnModule(crossVersion: String) extends mill.Module{ object rojoma extends Support(ivy"com.rojoma::rojoma-json:2.4.3") object rojomaV3 extends Support(ivy"com.rojoma::rojoma-json-v3:3.7.2"){ - override def basePath = super.basePath / ammonite.ops.up / "rojoma-v3" + override def basePath = super.basePath / up / "rojoma-v3" } object spray extends Support(ivy"io.spray::spray-json:1.3.3") } |