Swap over to simplified Mill module/source layout from SBT's

Removes a lot of useless folders and gives us a chance to exercise this simplified layout. Support for the SBT layout is still verified by our integration tests

48 files changed, 1 insertions, 70 deletions

diff --git a/core/src/main/scala/mill/Main.scala b/core/src/mill/Main.scala
index 3025994c..3025994c 100644
--- a/core/src/main/scala/mill/Main.scala
+++ b/core/src/mill/Main.scala
diff --git a/core/src/main/scala/mill/define/Applicative.scala b/core/src/mill/define/Applicative.scala
index 69c506f7..69c506f7 100644
--- a/core/src/main/scala/mill/define/Applicative.scala
+++ b/core/src/mill/define/Applicative.scala
diff --git a/core/src/main/scala/mill/define/Cross.scala b/core/src/mill/define/Cross.scala
index b51064be..b51064be 100644
--- a/core/src/main/scala/mill/define/Cross.scala
+++ b/core/src/mill/define/Cross.scala
diff --git a/core/src/main/scala/mill/define/Ctx.scala b/core/src/mill/define/Ctx.scala
index 6d685521..6d685521 100644
--- a/core/src/main/scala/mill/define/Ctx.scala
+++ b/core/src/mill/define/Ctx.scala
diff --git a/core/src/main/scala/mill/define/Discover.scala b/core/src/mill/define/Discover.scala
index 52f4ab77..52f4ab77 100644
--- a/core/src/main/scala/mill/define/Discover.scala
+++ b/core/src/mill/define/Discover.scala
diff --git a/core/src/main/scala/mill/define/Graph.scala b/core/src/mill/define/Graph.scala
index f06dca11..f06dca11 100644
--- a/core/src/main/scala/mill/define/Graph.scala
+++ b/core/src/mill/define/Graph.scala
diff --git a/core/src/main/scala/mill/define/Module.scala b/core/src/mill/define/Module.scala
index e42ce798..e42ce798 100644
--- a/core/src/main/scala/mill/define/Module.scala
+++ b/core/src/mill/define/Module.scala
diff --git a/core/src/main/scala/mill/define/Task.scala b/core/src/mill/define/Task.scala
index 90908e4e..90908e4e 100644
--- a/core/src/main/scala/mill/define/Task.scala
+++ b/core/src/mill/define/Task.scala
diff --git a/core/src/main/scala/mill/define/Worker.scala b/core/src/mill/define/Worker.scala
index 3d35d2e0..3d35d2e0 100644
--- a/core/src/main/scala/mill/define/Worker.scala
+++ b/core/src/mill/define/Worker.scala
diff --git a/core/src/main/scala/mill/eval/Evaluator.scala b/core/src/mill/eval/Evaluator.scala
index 44f24275..44f24275 100644
--- a/core/src/main/scala/mill/eval/Evaluator.scala
+++ b/core/src/mill/eval/Evaluator.scala
diff --git a/core/src/main/scala/mill/eval/PathRef.scala b/core/src/mill/eval/PathRef.scala
index 0a629a14..0a629a14 100644
--- a/core/src/main/scala/mill/eval/PathRef.scala
+++ b/core/src/mill/eval/PathRef.scala
diff --git a/core/src/main/scala/mill/eval/Result.scala b/core/src/mill/eval/Result.scala
index a9b2c70b..a9b2c70b 100644
--- a/core/src/main/scala/mill/eval/Result.scala
+++ b/core/src/mill/eval/Result.scala
diff --git a/core/src/main/scala/mill/eval/Tarjans.scala b/core/src/mill/eval/Tarjans.scala
index ade335a9..ade335a9 100644
--- a/core/src/main/scala/mill/eval/Tarjans.scala
+++ b/core/src/mill/eval/Tarjans.scala
diff --git a/core/src/main/scala/mill/main/MainRunner.scala b/core/src/mill/main/MainRunner.scala
index 5281b886..5281b886 100644
--- a/core/src/main/scala/mill/main/MainRunner.scala
+++ b/core/src/mill/main/MainRunner.scala
diff --git a/core/src/main/scala/mill/main/ParseArgs.scala b/core/src/mill/main/ParseArgs.scala
index dc848418..dc848418 100644
--- a/core/src/main/scala/mill/main/ParseArgs.scala
+++ b/core/src/mill/main/ParseArgs.scala
diff --git a/core/src/main/scala/mill/main/ReplApplyHandler.scala b/core/src/mill/main/ReplApplyHandler.scala
index 97efb6e5..97efb6e5 100644
--- a/core/src/main/scala/mill/main/ReplApplyHandler.scala
+++ b/core/src/mill/main/ReplApplyHandler.scala
diff --git a/core/src/main/scala/mill/main/Resolve.scala b/core/src/mill/main/Resolve.scala
index ed4c4f80..ed4c4f80 100644
--- a/core/src/main/scala/mill/main/Resolve.scala
+++ b/core/src/mill/main/Resolve.scala
diff --git a/core/src/main/scala/mill/main/RunScript.scala b/core/src/mill/main/RunScript.scala
index aa254048..aa254048 100644
--- a/core/src/main/scala/mill/main/RunScript.scala
+++ b/core/src/mill/main/RunScript.scala
diff --git a/core/src/main/scala/mill/modules/Jvm.scala b/core/src/mill/modules/Jvm.scala
index 888a687b..888a687b 100644
--- a/core/src/main/scala/mill/modules/Jvm.scala
+++ b/core/src/mill/modules/Jvm.scala
diff --git a/core/src/main/scala/mill/modules/Util.scala b/core/src/mill/modules/Util.scala
index cd674bad..cd674bad 100644
--- a/core/src/main/scala/mill/modules/Util.scala
+++ b/core/src/mill/modules/Util.scala
diff --git a/core/src/main/scala/mill/package.scala b/core/src/mill/package.scala
index 93916c8b..93916c8b 100644
--- a/core/src/main/scala/mill/package.scala
+++ b/core/src/mill/package.scala
diff --git a/core/src/main/scala/mill/util/AggWrapper.scala b/core/src/mill/util/AggWrapper.scala
index c2994a9a..c2994a9a 100644
--- a/core/src/main/scala/mill/util/AggWrapper.scala
+++ b/core/src/mill/util/AggWrapper.scala
diff --git a/core/src/main/scala/mill/util/Ctx.scala b/core/src/mill/util/Ctx.scala
index 60e6bdbf..60e6bdbf 100644
--- a/core/src/main/scala/mill/util/Ctx.scala
+++ b/core/src/mill/util/Ctx.scala
diff --git a/core/src/main/scala/mill/util/EitherOps.scala b/core/src/mill/util/EitherOps.scala
index da2552c8..da2552c8 100644
--- a/core/src/main/scala/mill/util/EitherOps.scala
+++ b/core/src/mill/util/EitherOps.scala
diff --git a/core/src/main/scala/mill/util/JsonFormatters.scala b/core/src/mill/util/JsonFormatters.scala
index 00a40e7d..00a40e7d 100644
--- a/core/src/main/scala/mill/util/JsonFormatters.scala
+++ b/core/src/mill/util/JsonFormatters.scala
diff --git a/core/src/main/scala/mill/util/Logger.scala b/core/src/mill/util/Logger.scala
index 17c66d27..17c66d27 100644
--- a/core/src/main/scala/mill/util/Logger.scala
+++ b/core/src/mill/util/Logger.scala
diff --git a/core/src/main/scala/mill/util/MultiBiMap.scala b/core/src/mill/util/MultiBiMap.scala
index 2cb81944..2cb81944 100644
--- a/core/src/main/scala/mill/util/MultiBiMap.scala
+++ b/core/src/mill/util/MultiBiMap.scala
diff --git a/core/src/test/examples/javac/build.sc b/core/src/test/examples/javac/build.sc
deleted file mode 100644
index e4f7ea01..00000000
--- a/core/src/test/examples/javac/build.sc
+++ /dev/null
@@ -1,69 +0,0 @@
-import mill.define.Task
-import mill.eval.PathRef
-
-object Foo {
-
-  import java.io.FileOutputStream
-  import java.util.jar.JarEntry
-
-  import ammonite.ops.{ls, pwd, read}
-  import mill.discover.Discovered
-  import mill.util.Ctx
-
-  val workspacePath = pwd / 'target / 'workspace / 'javac
-  val javacSrcPath = pwd / 'src / 'test / 'examples / 'javac
-  val javacDestPath = workspacePath / 'src
-
-  val sourceRootPath = javacDestPath / 'src
-  val resourceRootPath = javacDestPath / 'resources
-
-  // sourceRoot -> allSources -> classFiles
-  //                                |
-  //                                v
-  //           resourceRoot ---->  jar
-  val sourceRoot = Task.path(sourceRootPath)
-  val resourceRoot = Task.path(resourceRootPath)
-  val allSources = list(sourceRoot)
-  val classFiles = compileAll(allSources)
-  val jar = jarUp(resourceRoot, classFiles)
-
-  def compileAll(sources: Task[Seq[PathRef]]) = {
-    new Task.Subprocess(
-      Seq(sources),
-      args =>
-        Seq("javac") ++
-          args[Seq[PathRef]](0).map(_.path.toString) ++
-          Seq("-d", args.dest.toString)
-    ).map(_.dest)
-  }
-
-  def list(root: Task[PathRef]): Task[Seq[PathRef]] = {
-    root.map(x => ls.rec(x.path).map(PathRef(_)))
-  }
-
-  case class jarUp(roots: Task[PathRef]*) extends Task[PathRef] {
-
-    val inputs = roots
-
-    def evaluate(args: Ctx): PathRef = {
-
-      val output = new java.util.jar.JarOutputStream(new FileOutputStream(args.dest.toIO))
-      for {
-        root0 <- args.args
-        root = root0.asInstanceOf[PathRef]
-
-        path <- ls.rec(root.path)
-        if path.isFile
-      } {
-        val relative = path.relativeTo(root.path)
-        output.putNextEntry(new JarEntry(relative.toString))
-        output.write(read.bytes(path))
-      }
-      output.close()
-      args.dest
-    }
-  }
-
-}
-
-@main def main(): Any = Foo -> mill.Discovered[Foo.type]
diff --git a/core/src/test/examples/javac/resources/hello.txt b/core/test/resources/examples/javac/resources/hello.txt
index 5e1c309d..5e1c309d 100644
--- a/core/src/test/examples/javac/resources/hello.txt
+++ b/core/test/resources/examples/javac/resources/hello.txt
diff --git a/core/src/test/examples/javac/src/Bar.java b/core/test/resources/examples/javac/src/Bar.java
index 4e30c89b..4e30c89b 100644
--- a/core/src/test/examples/javac/src/Bar.java
+++ b/core/test/resources/examples/javac/src/Bar.java
diff --git a/core/src/test/examples/javac/src/Foo.java b/core/test/resources/examples/javac/src/Foo.java
index e694f9fa..e694f9fa 100644
--- a/core/src/test/examples/javac/src/Foo.java
+++ b/core/test/resources/examples/javac/src/Foo.java
diff --git a/core/src/test/scala/mill/TestMain.scala b/core/test/src/mill/TestMain.scala
index 80e7e627..80e7e627 100644
--- a/core/src/test/scala/mill/TestMain.scala
+++ b/core/test/src/mill/TestMain.scala
diff --git a/core/src/test/scala/mill/UTestFramework.scala b/core/test/src/mill/UTestFramework.scala
index 6c0d5191..6c0d5191 100644
--- a/core/src/test/scala/mill/UTestFramework.scala
+++ b/core/test/src/mill/UTestFramework.scala
diff --git a/core/src/test/scala/mill/define/ApplicativeTests.scala b/core/test/src/mill/define/ApplicativeTests.scala
index 72b715bb..72b715bb 100644
--- a/core/src/test/scala/mill/define/ApplicativeTests.scala
+++ b/core/test/src/mill/define/ApplicativeTests.scala
diff --git a/core/src/test/scala/mill/define/BasePathTests.scala b/core/test/src/mill/define/BasePathTests.scala
index a0be4762..a0be4762 100644
--- a/core/src/test/scala/mill/define/BasePathTests.scala
+++ b/core/test/src/mill/define/BasePathTests.scala
diff --git a/core/src/test/scala/mill/define/CacherTests.scala b/core/test/src/mill/define/CacherTests.scala
index eb981d46..eb981d46 100644
--- a/core/src/test/scala/mill/define/CacherTests.scala
+++ b/core/test/src/mill/define/CacherTests.scala
diff --git a/core/src/test/scala/mill/define/DiscoverTests.scala b/core/test/src/mill/define/DiscoverTests.scala
index 7621169a..7621169a 100644
--- a/core/src/test/scala/mill/define/DiscoverTests.scala
+++ b/core/test/src/mill/define/DiscoverTests.scala
diff --git a/core/src/test/scala/mill/define/GraphTests.scala b/core/test/src/mill/define/GraphTests.scala
index 7e6680be..7e6680be 100644
--- a/core/src/test/scala/mill/define/GraphTests.scala
+++ b/core/test/src/mill/define/GraphTests.scala
diff --git a/core/src/test/scala/mill/define/MacroErrorTests.scala b/core/test/src/mill/define/MacroErrorTests.scala
index a389feaa..a389feaa 100644
--- a/core/src/test/scala/mill/define/MacroErrorTests.scala
+++ b/core/test/src/mill/define/MacroErrorTests.scala
diff --git a/core/src/test/scala/mill/eval/EvaluationTests.scala b/core/test/src/mill/eval/EvaluationTests.scala
index 0d14988a..0d14988a 100644
--- a/core/src/test/scala/mill/eval/EvaluationTests.scala
+++ b/core/test/src/mill/eval/EvaluationTests.scala
diff --git a/core/src/test/scala/mill/eval/FailureTests.scala b/core/test/src/mill/eval/FailureTests.scala
index 12ed345d..12ed345d 100644
--- a/core/src/test/scala/mill/eval/FailureTests.scala
+++ b/core/test/src/mill/eval/FailureTests.scala
diff --git a/core/src/test/scala/mill/eval/JavaCompileJarTests.scala b/core/test/src/mill/eval/JavaCompileJarTests.scala
index 18948e27..5dd9cae1 100644
--- a/core/src/test/scala/mill/eval/JavaCompileJarTests.scala
+++ b/core/test/src/mill/eval/JavaCompileJarTests.scala
@@ -22,7 +22,7 @@ object JavaCompileJarTests extends TestSuite{
   val tests = Tests{
     'javac {
       val workspacePath = pwd / 'target / 'workspace / 'javac
-      val javacSrcPath = pwd / 'core / 'src / 'test / 'examples / 'javac
+      val javacSrcPath = pwd / 'core / 'test / 'resources / 'examples / 'javac
       val javacDestPath = workspacePath / 'src
 
       mkdir(pwd / 'target / 'workspace / 'javac)
diff --git a/core/src/test/scala/mill/eval/TarjanTests.scala b/core/test/src/mill/eval/TarjanTests.scala
index 2f9d0a4d..2f9d0a4d 100644
--- a/core/src/test/scala/mill/eval/TarjanTests.scala
+++ b/core/test/src/mill/eval/TarjanTests.scala
diff --git a/core/src/test/scala/mill/main/MainTests.scala b/core/test/src/mill/main/MainTests.scala
index c2499835..c2499835 100644
--- a/core/src/test/scala/mill/main/MainTests.scala
+++ b/core/test/src/mill/main/MainTests.scala
diff --git a/core/src/test/scala/mill/main/ParseArgsTest.scala b/core/test/src/mill/main/ParseArgsTest.scala
index 2ef07d36..2ef07d36 100644
--- a/core/src/test/scala/mill/main/ParseArgsTest.scala
+++ b/core/test/src/mill/main/ParseArgsTest.scala
diff --git a/core/src/test/scala/mill/util/TestEvaluator.scala b/core/test/src/mill/util/TestEvaluator.scala
index 47c9d940..47c9d940 100644
--- a/core/src/test/scala/mill/util/TestEvaluator.scala
+++ b/core/test/src/mill/util/TestEvaluator.scala
diff --git a/core/src/test/scala/mill/util/TestGraphs.scala b/core/test/src/mill/util/TestGraphs.scala
index 54c8d815..54c8d815 100644
--- a/core/src/test/scala/mill/util/TestGraphs.scala
+++ b/core/test/src/mill/util/TestGraphs.scala
diff --git a/core/src/test/scala/mill/util/TestUtil.scala b/core/test/src/mill/util/TestUtil.scala
index 1af12a74..1af12a74 100644
--- a/core/src/test/scala/mill/util/TestUtil.scala
+++ b/core/test/src/mill/util/TestUtil.scala