- 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.

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(