Vendor `com.lihaoyi:acyclic` codebase as a cross-building example, first non-working experiments in cross building working...

2 files changed, 19 insertions, 1 deletions

diff --git a/core/src/main/scala/mill/define/Cross.scala b/core/src/main/scala/mill/define/Cross.scala
new file mode 100644
index 00000000..c84e9b3d
--- /dev/null
+++ b/core/src/main/scala/mill/define/Cross.scala
@@ -0,0 +1,18 @@
+package mill.define
+
+
+case class Cross[+T](items: T*){
+  def flatMap[V](f: T => Cross[V]): Cross[(T, V)] = {
+    val flattened = for{
+      i <- items
+      k <- f(i).items
+    } yield (i, k)
+    Cross(flattened:_*)
+  }
+  def map[V](f: T => V): Cross[(T, V)] = {
+    Cross(items.map(i => i -> f(i)):_*)
+  }
+  def withFilter(f: T => Boolean) = {
+    Cross(items.filter(f):_*)
+  }
+}
diff --git a/core/src/main/scala/mill/define/Task.scala b/core/src/main/scala/mill/define/Task.scala
index ea197039..0853b06b 100644
--- a/core/src/main/scala/mill/define/Task.scala
+++ b/core/src/main/scala/mill/define/Task.scala
@@ -50,7 +50,7 @@ object Task extends Applicative.Applyer[Task, Task, Args]{
 
   def source(path: ammonite.ops.Path) = new Source(path)
 
-  trait Cacher extends mill.define.Cacher[Task, Target]{
+  trait Module extends mill.define.Cacher[Task, Target]{
     def wrapCached[T](t: Task[T], enclosing: String): Target[T] = new TargetImpl(t, enclosing)
   }
   class Task0[T](t: T) extends Task[T]{