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

6 files changed, 61 insertions, 14 deletions

diff --git a/core/src/test/scala/mill/CacherTests.scala b/core/src/test/scala/mill/CacherTests.scala
index 5931691d..6e0087b1 100644
--- a/core/src/test/scala/mill/CacherTests.scala
+++ b/core/src/test/scala/mill/CacherTests.scala
@@ -9,7 +9,7 @@ import utest.framework.TestPath
 
 object CacherTests extends TestSuite{
   object Base extends Base
-  trait Base extends Task.Cacher{
+  trait Base extends Task.Module{
     def value = T{ 1 }
   }
   object Middle extends Middle
diff --git a/core/src/test/scala/mill/CrossTests.scala b/core/src/test/scala/mill/CrossTests.scala
new file mode 100644
index 00000000..ebf5d065
--- /dev/null
+++ b/core/src/test/scala/mill/CrossTests.scala
@@ -0,0 +1,47 @@
+package mill
+
+import mill.define.Cross
+import utest._
+
+object CrossTests extends TestSuite{
+
+  val tests = Tests{
+    def assertEquals[T](value: Cross[T], value1: Cross[T]) = {
+      assert(value == value1)
+    }
+    'map - assertEquals(
+      for(a <- Cross(1, 2, 3)) yield a.toString,
+      Cross(1 -> "1", 2 -> "2", 3 -> "3")
+    )
+    'flatMapFilter - assertEquals(
+      for{
+        a <- Cross(1, 2)
+        b <- Cross("A", "B")
+        if !(a == 2 && b == "B")
+      } yield b * a,
+      Cross(
+        (1 -> ("A" -> "A")),
+        (1 -> ("B" -> "B")),
+        (2 -> ("A" -> "AA"))
+      )
+    )
+    'reuse - {
+      val matrix = for{
+        a <- Cross(1, 2)
+        b <- Cross("A", "B")
+        if !(a == 2 && b == "B")
+      } yield ()
+      assertEquals(
+        for((a, (b, _)) <- matrix)
+        yield b * a,
+        Cross(
+          (1 -> ("A" -> "A")),
+          (1 -> ("B" -> "B")),
+          (2 -> ("A" -> "AA"))
+        )
+      )
+    }
+
+
+  }
+}
diff --git a/core/src/test/scala/mill/EvaluationTests.scala b/core/src/test/scala/mill/EvaluationTests.scala
index 32d2b847..a5fd72a8 100644
--- a/core/src/test/scala/mill/EvaluationTests.scala
+++ b/core/src/test/scala/mill/EvaluationTests.scala
@@ -3,7 +3,7 @@ package mill
 
 import mill.TestUtil.{Test, test}
 import mill.define.{Target, Task}
-import mill.define.Task.Cacher
+import mill.define.Task.Module
 import mill.discover.Discovered
 import mill.eval.Evaluator
 import mill.util.OSet
@@ -170,7 +170,7 @@ object EvaluationTests extends TestSuite{
         //  task1 -------- right
         //               _/
         // change - task2
-        object build extends Cacher{
+        object build extends Module{
           val task1 = T.task{ 1 }
           def left = T{ task1() }
           val change = test()
@@ -203,7 +203,7 @@ object EvaluationTests extends TestSuite{
         //      _ left _
         //     /        \
         // task -------- right
-        object build extends Cacher{
+        object build extends Module{
           val task = T.task{ 1 }
           def left = T{ task() }
           def right = T{ task() + left() + 1 }
@@ -222,7 +222,7 @@ object EvaluationTests extends TestSuite{
         //      _ left
         //     /
         // task -------- right
-        object build extends Cacher{
+        object build extends Module{
           val task = T.task{ 1 }
           def left = T{ task() }
           def right = T{ task() }
@@ -241,7 +241,7 @@ object EvaluationTests extends TestSuite{
         //       _ left _____________
         //      /        \           \
         // task1 -------- right ----- task2
-        object build extends Cacher{
+        object build extends Module{
           val task1 = T.task{ 1 }
           def left = T{ task1() }
           def right = T{ task1() + left() + 1 }
@@ -266,7 +266,7 @@ object EvaluationTests extends TestSuite{
         // up    middle -- down
         //                /
         //           right
-        object build extends Cacher{
+        object build extends Module{
           var leftCount = 0
           var rightCount = 0
           var middleCount = 0
diff --git a/core/src/test/scala/mill/JavaCompileJarTests.scala b/core/src/test/scala/mill/JavaCompileJarTests.scala
index 39d3a93a..e19073a4 100644
--- a/core/src/test/scala/mill/JavaCompileJarTests.scala
+++ b/core/src/test/scala/mill/JavaCompileJarTests.scala
@@ -30,7 +30,7 @@ object JavaCompileJarTests extends TestSuite{
       mkdir(pwd / 'target / 'workspace / 'javac)
       cp(javacSrcPath, javacDestPath)
 
-      object Build extends Task.Cacher{
+      object Build extends Task.Module{
         def sourceRootPath = javacDestPath / 'src
         def resourceRootPath = javacDestPath / 'resources
 
diff --git a/core/src/test/scala/mill/MacroErrorTests.scala b/core/src/test/scala/mill/MacroErrorTests.scala
index 20bf805a..b9de5594 100644
--- a/core/src/test/scala/mill/MacroErrorTests.scala
+++ b/core/src/test/scala/mill/MacroErrorTests.scala
@@ -10,7 +10,7 @@ object MacroErrorTests extends TestSuite{
       val expectedMsg =
         "T{} members must be defs defined in a Cacher class/trait/object body"
 
-      val err = compileError("object Foo extends mill.define.Task.Cacher{ val x = T{1} }")
+      val err = compileError("object Foo extends mill.define.Task.Module{ val x = T{1} }")
       assert(err.msg == expectedMsg)
     }
 
@@ -35,7 +35,7 @@ object MacroErrorTests extends TestSuite{
 
         val expectedMsg =
           "Target#apply() call cannot use `value n` defined within the T{...} block"
-        val err = compileError("""new mill.define.Task.Cacher{
+        val err = compileError("""new mill.define.Task.Module{
           def a = T{ 1 }
           val arr = Array(a)
           def b = {
@@ -51,7 +51,7 @@ object MacroErrorTests extends TestSuite{
 
         val expectedMsg =
           "Target#apply() call cannot use `value x` defined within the T{...} block"
-        val err = compileError("""new mill.define.Task.Cacher{
+        val err = compileError("""new mill.define.Task.Module{
           def a = T{ 1 }
           val arr = Array(a)
           def b = {
diff --git a/core/src/test/scala/mill/TestGraphs.scala b/core/src/test/scala/mill/TestGraphs.scala
index 46fad053..1e69fc0b 100644
--- a/core/src/test/scala/mill/TestGraphs.scala
+++ b/core/src/test/scala/mill/TestGraphs.scala
@@ -1,6 +1,6 @@
 package mill
 
-import mill.define.Task.Cacher
+import mill.define.Task.Module
 import mill.TestUtil.test
 
 class TestGraphs(){
@@ -43,7 +43,7 @@ class TestGraphs(){
     val down = test(test(up), test(up))
   }
 
-  object defCachedDiamond extends Cacher{
+  object defCachedDiamond extends Module{
     def up = T{ test() }
     def left = T{ test(up) }
     def right = T{ test(up) }
@@ -51,7 +51,7 @@ class TestGraphs(){
   }
 
 
-  object borkedCachedDiamond2 extends Cacher {
+  object borkedCachedDiamond2 extends Module {
     def up = test()
     def left = test(up)
     def right = test(up)