- Swap over to new `ivy"foo:bar:baz"` syntax for defining ivy dependencies

- `projectDeps` is now `moduleDeps` for compatibility with our `Module` terminology

- `scalalib.Module` is now `ScalaModule` for compatibility with `import scalalib._`

3 files changed, 32 insertions, 33 deletions

diff --git a/integration/src/test/resources/acyclic/build.sc b/integration/src/test/resources/acyclic/build.sc
index 140e5dc6..b8f878ad 100644
--- a/integration/src/test/resources/acyclic/build.sc
+++ b/integration/src/test/resources/acyclic/build.sc
@@ -1,5 +1,5 @@
 import mill.Cross
-import mill.scalalib.{SbtModule, PublishModule, Dep, CrossSbtModule}
+import mill.scalalib.{SbtModule, PublishModule, Dep, CrossSbtModule, DepSyntax}
 import mill.scalalib.publish.{PomSettings, License, Developer, SCM}
 
 object acyclic extends Cross[AcyclicModule]("2.10.6", "2.11.8", "2.12.3", "2.12.4")
@@ -25,12 +25,12 @@ class AcyclicModule(val crossScalaVersion: String) extends CrossSbtModule with P
   )
 
   def ivyDeps = Agg(
-    Dep.Java("org.scala-lang", "scala-compiler", scalaVersion())
+    ivy"org.scala-lang:scala-compiler:${scalaVersion()}"
   )
   object test extends Tests{
     def forkWorkingDir = ammonite.ops.pwd / 'target / 'workspace / 'acyclic
     def ivyDeps = Agg(
-      Dep("com.lihaoyi", "utest", "0.6.0")
+      ivy"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 de0f6495..e541e3f1 100644
--- a/integration/src/test/resources/better-files/build.sc
+++ b/integration/src/test/resources/better-files/build.sc
@@ -1,4 +1,4 @@
-import mill.scalalib.{SbtModule, Dep}
+import mill.scalalib.{SbtModule, Dep, DepSyntax}
 
 trait BetterFilesModule extends SbtModule{
   def scalaVersion = "2.12.4"
@@ -51,10 +51,10 @@ trait BetterFilesModule extends SbtModule{
   )
   override def javacOptions = Seq("-source", "1.8", "-target", "1.8", "-Xlint")
   object test extends Tests{
-    def projectDeps =
-      if (this == core.test) super.projectDeps
-      else super.projectDeps ++ Seq(core.test)
-    def ivyDeps = Agg(Dep("org.scalatest", "scalatest", "3.0.4"))
+    def moduleDeps =
+      if (this == core.test) super.moduleDeps
+      else super.moduleDeps ++ Seq(core.test)
+    def ivyDeps = Agg(ivy"org.scalatest::scalatest:3.0.4")
     def testFramework = "org.scalatest.tools.Framework"
   }
 }
@@ -62,19 +62,19 @@ trait BetterFilesModule extends SbtModule{
 object core extends BetterFilesModule
 
 object akka extends BetterFilesModule{
-  def projectDeps = Seq(core)
-  def ivyDeps = Agg(Dep("com.typesafe.akka", "akka-actor", "2.5.6"))
+  def moduleDeps = Seq(core)
+  def ivyDeps = Agg(ivy"com.typesafe.akka::akka-actor:2.5.6")
 }
 
 object shapeless extends BetterFilesModule{
-  def projectDeps = Seq(core)
-  def ivyDeps = Agg(Dep("com.chuusai", "shapeless", "2.3.2"))
+  def moduleDeps = Seq(core)
+  def ivyDeps = Agg(ivy"com.chuusai::shapeless:2.3.2")
 }
 
 object benchmarks extends BetterFilesModule{
-  def projectDeps = Seq(core)
+  def moduleDeps = Seq(core)
   def ivyDeps = Agg(
-    Dep.Java("commons-io", "commons-io", "2.5")
+    ivy"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 161f302a..4898a3cb 100644
--- a/integration/src/test/resources/jawn/build.sc
+++ b/integration/src/test/resources/jawn/build.sc
@@ -1,7 +1,6 @@
 import mill.scalalib
 import mill.Cross
-import mill.scalalib.{Dep, TestModule, Module}
-
+import mill.scalalib.{Dep, TestModule, DepSyntax}
 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
@@ -13,12 +12,12 @@ class JawnModule(crossVersion: String) extends mill.Module{
       "-optimize",
       "-unchecked"
     )
-    def testProjectDeps: Seq[TestModule] = Nil
+    def testModuleDeps: Seq[TestModule] = Nil
     object test extends Tests{
-      def projectDeps = super.projectDeps ++ testProjectDeps
+      def moduleDeps = super.moduleDeps ++ testModuleDeps
       def ivyDeps = Agg(
-        Dep("org.scalatest", "scalatest", "3.0.3"),
-        Dep("org.scalacheck", "scalacheck", "1.13.5")
+        ivy"org.scalatest::scalatest:3.0.3",
+        ivy"org.scalacheck::scalacheck:1.13.5"
       )
       def testFramework = "org.scalatest.tools.Framework"
     }
@@ -26,35 +25,35 @@ class JawnModule(crossVersion: String) extends mill.Module{
   object parser extends JawnModule
 
   object util extends JawnModule{
-    def projectDeps = Seq(parser)
-    def testProjectDeps = Seq(parser.test)
+    def moduleDeps = Seq(parser)
+    def testModuleDeps = Seq(parser.test)
   }
   object ast extends JawnModule{
-    def projectDeps = Seq(parser, util)
-    def testProjectDeps = Seq(parser.test, util.test)
+    def moduleDeps = Seq(parser, util)
+    def testModuleDeps = Seq(parser.test, util.test)
   }
   class Support(ivyDeps0: Dep*)(implicit ctx: mill.define.Ctx) extends JawnModule{
-    def projectDeps = Seq[Module](parser)
+    def moduleDeps = Seq(parser)
     def ivyDeps = Agg.from(ivyDeps0)
   }
   object support extends mill.Module{
-    object argonaut extends Support(Dep("io.argonaut", "argonaut", "6.2"))
-    object json4s extends Support(Dep("org.json4s", "json4s-ast", "3.5.2"))
+    object argonaut extends Support(ivy"io.argonaut::argonaut:6.2")
+    object json4s extends Support(ivy"org.json4s::json4s-ast:3.5.2")
 
     object play extends Support(){
       def ivyDeps = mill.T{
         scalaBinaryVersion() match{
-          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"))
+          case "2.10" => Agg(ivy"com.typesafe.play::play-json:2.4.11")
+          case "2.11" => Agg(ivy"com.typesafe.play::play-json:2.5.15")
+          case _ => Agg(ivy"com.typesafe.play::play-json:2.6.0")
         }
       }
     }
 
-    object rojoma extends Support(Dep("com.rojoma", "rojoma-json", "2.4.3"))
-    object rojomaV3 extends Support(Dep("com.rojoma", "rojoma-json-v3", "3.7.2")){
+    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"
     }
-    object spray extends Support(Dep("io.spray", "spray-json", "1.3.3"))
+    object spray extends Support(ivy"io.spray::spray-json:1.3.3")
   }
 }
\ No newline at end of file