Swap over to new `projectDeps` mechanism for defining dependencies between various `scalaplugin.Subproject`s

5 files changed, 5 insertions, 4 deletions

diff --git a/core/src/main/scala/mill/discover/Discovered.scala b/core/src/main/scala/mill/discover/Discovered.scala
index c8edf26a..3fca9a9f 100644
--- a/core/src/main/scala/mill/discover/Discovered.scala
+++ b/core/src/main/scala/mill/discover/Discovered.scala
@@ -1,6 +1,6 @@
 package mill.discover
 
-import mill.define.Task
+import mill.define.{Target, Task}
 import mill.discover.Router.{EntryPoint, Result}
 import play.api.libs.json.Format
 
diff --git a/core/src/main/scala/mill/eval/PathRef.scala b/core/src/main/scala/mill/eval/PathRef.scala
index 5f7efe89..6d99ad91 100644
--- a/core/src/main/scala/mill/eval/PathRef.scala
+++ b/core/src/main/scala/mill/eval/PathRef.scala
@@ -55,6 +55,7 @@ case class PathRef(path: ammonite.ops.Path){
 }
 
 object PathRef{
+  implicit def make(p: ammonite.ops.Path): PathRef = PathRef(p)
   private implicit val pathFormat: Format[Path] = JsonFormatters.pathFormat
   implicit def jsonFormatter: Format[PathRef] = Json.format
 }
diff --git a/core/src/main/scala/mill/modules/Jvm.scala b/core/src/main/scala/mill/modules/Jvm.scala
index bfb7defe..bbaf1474 100644
--- a/core/src/main/scala/mill/modules/Jvm.scala
+++ b/core/src/main/scala/mill/modules/Jvm.scala
@@ -64,7 +64,7 @@ object Jvm {
     val inputs = roots
     def evaluate(args: Args): PathRef = {
       createJar(args.dest, args.args.map(_.asInstanceOf[PathRef].path))
-      PathRef(args.dest)
+      args.dest
     }
   }
 }
diff --git a/core/src/test/examples/javac/build.sc b/core/src/test/examples/javac/build.sc
index f8789eb7..a54e2110 100644
--- a/core/src/test/examples/javac/build.sc
+++ b/core/src/test/examples/javac/build.sc
@@ -60,7 +60,7 @@ object Foo {
         output.write(read.bytes(path))
       }
       output.close()
-      PathRef(args.dest)
+      args.dest
     }
   }
 
diff --git a/core/src/test/scala/mill/CacherTests.scala b/core/src/test/scala/mill/CacherTests.scala
index 1a510e4c..b6aebb0c 100644
--- a/core/src/test/scala/mill/CacherTests.scala
+++ b/core/src/test/scala/mill/CacherTests.scala
@@ -33,7 +33,7 @@ object CacherTests extends TestSuite{
 
     'simpleDefIsCached - assert(
       Base.value eq Base.value,
-      eval(Base, Base.value) == 1
+      eval(Base, Base.value) == 11
     )
 
     'overridingDefIsAlsoCached - assert(