summaryrefslogtreecommitdiff
path: root/integration/src/test/resources/jawn/build.sc
diff options
context:
space:
mode:
Diffstat (limited to 'integration/src/test/resources/jawn/build.sc')
-rw-r--r--integration/src/test/resources/jawn/build.sc12
1 files changed, 6 insertions, 6 deletions
diff --git a/integration/src/test/resources/jawn/build.sc b/integration/src/test/resources/jawn/build.sc
index 8b830f70..a90d93b5 100644
--- a/integration/src/test/resources/jawn/build.sc
+++ b/integration/src/test/resources/jawn/build.sc
@@ -4,7 +4,7 @@ import mill.scalalib.{Dep, TestModule, Module}
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
+ override def basePath = super.basePath / ammonite.ops.up / ammonite.ops.up
trait JawnModule extends scalalib.SbtModule{
def scalaVersion = crossVersion
@@ -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 = Seq(
+ def ivyDeps = OSet(
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 = ivyDeps0
+ def ivyDeps = OSet.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" => Seq(Dep("com.typesafe.play", "play-json", "2.4.11"))
- case "2.11" => Seq(Dep("com.typesafe.play", "play-json", "2.5.15"))
- case _ => Seq(Dep("com.typesafe.play", "play-json", "2.6.0"))
+ 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"))
}
}
}