diff options
author | Li Haoyi <haoyi.sg@gmail.com> | 2017-11-11 16:21:21 -0800 |
---|---|---|
committer | Li Haoyi <haoyi.sg@gmail.com> | 2017-11-11 16:21:21 -0800 |
commit | c6f6ec99755dcda9e96f4dbd75164c236c896475 (patch) | |
tree | b47cca080fb8885818d458de0446d9c1cf65854b /scalaplugin | |
parent | 0b5de583df91b7f2b33490003a8d35934c7e27f9 (diff) | |
download | mill-c6f6ec99755dcda9e96f4dbd75164c236c896475.tar.gz mill-c6f6ec99755dcda9e96f4dbd75164c236c896475.tar.bz2 mill-c6f6ec99755dcda9e96f4dbd75164c236c896475.zip |
- Give `Target`s nicer `toString`s using `sourcecode.Enclosing`. Still not as good as the `Labeling` they get during evaluation, but better than nothing
- Split out `TargetImpl` from `Target`, so we can make our dummy `TestUtils.Test` class implement `Target`s for discoverability etc.
- Make `Discovered` only discover `Target`s, not `Task`s
- Make `groupAroundNamedTargets` properly sort the groups topologically, and by flexible enough to combine groups which have cycles between them.
Diffstat (limited to 'scalaplugin')
-rw-r--r-- | scalaplugin/src/main/scala/mill/scalaplugin/Subproject.scala | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/scalaplugin/src/main/scala/mill/scalaplugin/Subproject.scala b/scalaplugin/src/main/scala/mill/scalaplugin/Subproject.scala index 054bc5be..1cf38840 100644 --- a/scalaplugin/src/main/scala/mill/scalaplugin/Subproject.scala +++ b/scalaplugin/src/main/scala/mill/scalaplugin/Subproject.scala @@ -189,18 +189,15 @@ trait Subproject extends Cacher{ def depClasspath = T{ Seq.empty[PathRef] } - def upstreamRunClasspath = T { - Task.traverse( - for (p <- projectDeps) - yield T.task(p.runDepClasspath() ++ Seq(p.compiled())) - ) - } - def upstreamCompileClasspath = T { - Task.traverse( - for (p <- projectDeps) - yield T.task(p.compileDepClasspath() ++ Seq(p.compiled())) - ) - } + def upstreamRunClasspath = Task.traverse( + for (p <- projectDeps) + yield T.task(p.runDepClasspath() ++ Seq(p.compiled())) + ) + + def upstreamCompileClasspath = Task.traverse( + for (p <- projectDeps) + yield T.task(p.compileDepClasspath() ++ Seq(p.compiled())) + ) def compileDepClasspath: T[Seq[PathRef]] = T{ upstreamCompileClasspath().flatten ++ depClasspath() ++ resolveDependencies( |