summaryrefslogtreecommitdiff
path: root/core/src/main
diff options
context:
space:
mode:
authorLi Haoyi <haoyi.sg@gmail.com>2017-11-11 11:36:47 -0800
committerLi Haoyi <haoyi.sg@gmail.com>2017-11-11 11:36:47 -0800
commit0b5de583df91b7f2b33490003a8d35934c7e27f9 (patch)
tree6b938209cf4ea270c059136fa944b7c38831e067 /core/src/main
parentefbaf34d7d977a13a083638426b86f5a2218eceb (diff)
downloadmill-0b5de583df91b7f2b33490003a8d35934c7e27f9.tar.gz
mill-0b5de583df91b7f2b33490003a8d35934c7e27f9.tar.bz2
mill-0b5de583df91b7f2b33490003a8d35934c7e27f9.zip
Swap over to new `projectDeps` mechanism for defining dependencies between various `scalaplugin.Subproject`s
Diffstat (limited to 'core/src/main')
-rw-r--r--core/src/main/scala/mill/discover/Discovered.scala2
-rw-r--r--core/src/main/scala/mill/eval/PathRef.scala1
-rw-r--r--core/src/main/scala/mill/modules/Jvm.scala2
3 files changed, 3 insertions, 2 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
}
}
}