summaryrefslogtreecommitdiff
path: root/integration
diff options
context:
space:
mode:
authorLi Haoyi <haoyi.sg@gmail.com>2018-01-13 15:07:04 -0800
committerLi Haoyi <haoyi.sg@gmail.com>2018-01-13 15:07:04 -0800
commit38ca4a5005dbaee94e674c41bb7262d603eec73c (patch)
tree9e087e24ffe21d26518c3daa956f3d063f85eea7 /integration
parent57501fca3b6c2c64d32744e6d534b9de3a6674f6 (diff)
downloadmill-38ca4a5005dbaee94e674c41bb7262d603eec73c.tar.gz
mill-38ca4a5005dbaee94e674c41bb7262d603eec73c.tar.bz2
mill-38ca4a5005dbaee94e674c41bb7262d603eec73c.zip
rename OSet -> Agg
Diffstat (limited to 'integration')
-rw-r--r--integration/src/test/resources/acyclic/build.sc4
-rw-r--r--integration/src/test/resources/better-files/build.sc8
-rw-r--r--integration/src/test/resources/jawn/build.sc10
3 files changed, 11 insertions, 11 deletions
diff --git a/integration/src/test/resources/acyclic/build.sc b/integration/src/test/resources/acyclic/build.sc
index 094893f5..140e5dc6 100644
--- a/integration/src/test/resources/acyclic/build.sc
+++ b/integration/src/test/resources/acyclic/build.sc
@@ -24,12 +24,12 @@ class AcyclicModule(val crossScalaVersion: String) extends CrossSbtModule with P
)
)
- def ivyDeps = OSet(
+ def ivyDeps = Agg(
Dep.Java("org.scala-lang", "scala-compiler", scalaVersion())
)
object test extends Tests{
def forkWorkingDir = ammonite.ops.pwd / 'target / 'workspace / 'acyclic
- def ivyDeps = OSet(
+ def ivyDeps = Agg(
Dep("com.lihaoyi", "utest", "0.6.0")
)
def testFramework = "utest.runner.Framework"
diff --git a/integration/src/test/resources/better-files/build.sc b/integration/src/test/resources/better-files/build.sc
index fe11f1b8..de0f6495 100644
--- a/integration/src/test/resources/better-files/build.sc
+++ b/integration/src/test/resources/better-files/build.sc
@@ -54,7 +54,7 @@ trait BetterFilesModule extends SbtModule{
def projectDeps =
if (this == core.test) super.projectDeps
else super.projectDeps ++ Seq(core.test)
- def ivyDeps = OSet(Dep("org.scalatest", "scalatest", "3.0.4"))
+ def ivyDeps = Agg(Dep("org.scalatest", "scalatest", "3.0.4"))
def testFramework = "org.scalatest.tools.Framework"
}
}
@@ -63,17 +63,17 @@ object core extends BetterFilesModule
object akka extends BetterFilesModule{
def projectDeps = Seq(core)
- def ivyDeps = OSet(Dep("com.typesafe.akka", "akka-actor", "2.5.6"))
+ def ivyDeps = Agg(Dep("com.typesafe.akka", "akka-actor", "2.5.6"))
}
object shapeless extends BetterFilesModule{
def projectDeps = Seq(core)
- def ivyDeps = OSet(Dep("com.chuusai", "shapeless", "2.3.2"))
+ def ivyDeps = Agg(Dep("com.chuusai", "shapeless", "2.3.2"))
}
object benchmarks extends BetterFilesModule{
def projectDeps = Seq(core)
- def ivyDeps = OSet(
+ def ivyDeps = Agg(
Dep.Java("commons-io", "commons-io", "2.5")
// "fastjavaio" % "fastjavaio" % "1.0" from "https://github.com/williamfiset/FastJavaIO/releases/download/v1.0/fastjavaio.jar"
)
diff --git a/integration/src/test/resources/jawn/build.sc b/integration/src/test/resources/jawn/build.sc
index a90d93b5..e76437b7 100644
--- a/integration/src/test/resources/jawn/build.sc
+++ b/integration/src/test/resources/jawn/build.sc
@@ -16,7 +16,7 @@ class JawnModule(crossVersion: String) extends mill.Module{
def testProjectDeps: Seq[TestModule] = Nil
object test extends Tests{
def projectDeps = super.projectDeps ++ testProjectDeps
- def ivyDeps = OSet(
+ def ivyDeps = Agg(
Dep("org.scalatest", "scalatest", "3.0.3"),
Dep("org.scalacheck", "scalacheck", "1.13.5")
)
@@ -35,7 +35,7 @@ class JawnModule(crossVersion: String) extends mill.Module{
}
class Support(ivyDeps0: Dep*)(implicit ctx: mill.Module.Ctx) extends JawnModule{
def projectDeps = Seq[Module](parser)
- def ivyDeps = OSet.from(ivyDeps0)
+ def ivyDeps = Agg.from(ivyDeps0)
}
object support extends mill.Module{
object argonaut extends Support(Dep("io.argonaut", "argonaut", "6.2"))
@@ -44,9 +44,9 @@ class JawnModule(crossVersion: String) extends mill.Module{
object play extends Support(){
def ivyDeps = mill.T{
scalaBinaryVersion() match{
- case "2.10" => OSet(Dep("com.typesafe.play", "play-json", "2.4.11"))
- case "2.11" => OSet(Dep("com.typesafe.play", "play-json", "2.5.15"))
- case _ => OSet(Dep("com.typesafe.play", "play-json", "2.6.0"))
+ case "2.10" => Agg(Dep("com.typesafe.play", "play-json", "2.4.11"))
+ case "2.11" => Agg(Dep("com.typesafe.play", "play-json", "2.5.15"))
+ case _ => Agg(Dep("com.typesafe.play", "play-json", "2.6.0"))
}
}
}