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

34 files changed, 0 insertions, 637 deletions

diff --git a/scalalib/src/main/scala/mill/scalalib/Dep.scala b/scalalib/src/mill/scalalib/Dep.scala
index aa301fcb..aa301fcb 100644
--- a/scalalib/src/main/scala/mill/scalalib/Dep.scala
+++ b/scalalib/src/mill/scalalib/Dep.scala
diff --git a/scalalib/src/main/scala/mill/scalalib/GenIdea.scala b/scalalib/src/mill/scalalib/GenIdea.scala
index 4496c8c6..4496c8c6 100644
--- a/scalalib/src/main/scala/mill/scalalib/GenIdea.scala
+++ b/scalalib/src/mill/scalalib/GenIdea.scala
diff --git a/scalalib/src/main/scala/mill/scalalib/Lib.scala b/scalalib/src/mill/scalalib/Lib.scala
index a038a59b..a038a59b 100644
--- a/scalalib/src/main/scala/mill/scalalib/Lib.scala
+++ b/scalalib/src/mill/scalalib/Lib.scala
diff --git a/scalalib/src/main/scala/mill/scalalib/Main.scala b/scalalib/src/mill/scalalib/Main.scala
index 584fe9d1..584fe9d1 100644
--- a/scalalib/src/main/scala/mill/scalalib/Main.scala
+++ b/scalalib/src/mill/scalalib/Main.scala
diff --git a/scalalib/src/main/scala/mill/scalalib/MiscModule.scala b/scalalib/src/mill/scalalib/MiscModule.scala
index 502ba461..502ba461 100644
--- a/scalalib/src/main/scala/mill/scalalib/MiscModule.scala
+++ b/scalalib/src/mill/scalalib/MiscModule.scala
diff --git a/scalalib/src/main/scala/mill/scalalib/PublishModule.scala b/scalalib/src/mill/scalalib/PublishModule.scala
index 64efce77..64efce77 100644
--- a/scalalib/src/main/scala/mill/scalalib/PublishModule.scala
+++ b/scalalib/src/mill/scalalib/PublishModule.scala
diff --git a/scalalib/src/main/scala/mill/scalalib/ScalaModule.scala b/scalalib/src/mill/scalalib/ScalaModule.scala
index 1b2bd28d..1b2bd28d 100644
--- a/scalalib/src/main/scala/mill/scalalib/ScalaModule.scala
+++ b/scalalib/src/mill/scalalib/ScalaModule.scala
diff --git a/scalalib/src/main/scala/mill/scalalib/TestRunner.scala b/scalalib/src/mill/scalalib/TestRunner.scala
index 01726022..01726022 100644
--- a/scalalib/src/main/scala/mill/scalalib/TestRunner.scala
+++ b/scalalib/src/mill/scalalib/TestRunner.scala
diff --git a/scalalib/src/main/scala/mill/scalalib/package.scala b/scalalib/src/mill/scalalib/package.scala
index 5a282e82..5a282e82 100644
--- a/scalalib/src/main/scala/mill/scalalib/package.scala
+++ b/scalalib/src/mill/scalalib/package.scala
diff --git a/scalalib/src/main/scala/mill/scalalib/publish/Ivy.scala b/scalalib/src/mill/scalalib/publish/Ivy.scala
index b0b6443e..b0b6443e 100644
--- a/scalalib/src/main/scala/mill/scalalib/publish/Ivy.scala
+++ b/scalalib/src/mill/scalalib/publish/Ivy.scala
diff --git a/scalalib/src/main/scala/mill/scalalib/publish/JsonFormatters.scala b/scalalib/src/mill/scalalib/publish/JsonFormatters.scala
index cf1af557..cf1af557 100644
--- a/scalalib/src/main/scala/mill/scalalib/publish/JsonFormatters.scala
+++ b/scalalib/src/mill/scalalib/publish/JsonFormatters.scala
diff --git a/scalalib/src/main/scala/mill/scalalib/publish/LocalPublisher.scala b/scalalib/src/mill/scalalib/publish/LocalPublisher.scala
index a9957e5c..a9957e5c 100644
--- a/scalalib/src/main/scala/mill/scalalib/publish/LocalPublisher.scala
+++ b/scalalib/src/mill/scalalib/publish/LocalPublisher.scala
diff --git a/scalalib/src/main/scala/mill/scalalib/publish/Pom.scala b/scalalib/src/mill/scalalib/publish/Pom.scala
index 74dc6e8f..74dc6e8f 100644
--- a/scalalib/src/main/scala/mill/scalalib/publish/Pom.scala
+++ b/scalalib/src/mill/scalalib/publish/Pom.scala
diff --git a/scalalib/src/main/scala/mill/scalalib/publish/SonatypeHttpApi.scala b/scalalib/src/mill/scalalib/publish/SonatypeHttpApi.scala
index 8ccdf3ea..8ccdf3ea 100644
--- a/scalalib/src/main/scala/mill/scalalib/publish/SonatypeHttpApi.scala
+++ b/scalalib/src/mill/scalalib/publish/SonatypeHttpApi.scala
diff --git a/scalalib/src/main/scala/mill/scalalib/publish/SonatypePublisher.scala b/scalalib/src/mill/scalalib/publish/SonatypePublisher.scala
index 0749b0c5..0749b0c5 100644
--- a/scalalib/src/main/scala/mill/scalalib/publish/SonatypePublisher.scala
+++ b/scalalib/src/mill/scalalib/publish/SonatypePublisher.scala
diff --git a/scalalib/src/main/scala/mill/scalalib/publish/package.scala b/scalalib/src/mill/scalalib/publish/package.scala
index 99eeec14..99eeec14 100644
--- a/scalalib/src/main/scala/mill/scalalib/publish/package.scala
+++ b/scalalib/src/mill/scalalib/publish/package.scala
diff --git a/scalalib/src/main/scala/mill/scalalib/publish/settings.scala b/scalalib/src/mill/scalalib/publish/settings.scala
index eb0a44b6..eb0a44b6 100644
--- a/scalalib/src/main/scala/mill/scalalib/publish/settings.scala
+++ b/scalalib/src/mill/scalalib/publish/settings.scala
diff --git a/scalalib/src/test/resources/gen-idea/idea/libraries/modules_scala-xml_2.12_1.0.6_scala-xml_2.12-1.0.6-sources.jar.xml b/scalalib/src/test/resources/gen-idea/idea/libraries/modules_scala-xml_2.12_1.0.6_scala-xml_2.12-1.0.6-sources.jar.xml
deleted file mode 100644
index a6398d46..00000000
--- a/scalalib/src/test/resources/gen-idea/idea/libraries/modules_scala-xml_2.12_1.0.6_scala-xml_2.12-1.0.6-sources.jar.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="libraryTable">
-    <library name="modules_scala-xml_2.12_1.0.6_scala-xml_2.12-1.0.6-sources.jar">
-        <CLASSES>
-            <root url="jar:COURSIER_HOME/cache/v1/https/repo1.maven.org/maven2/org/scala-lang/modules/scala-xml_2.12/1.0.6/scala-xml_2.12-1.0.6-sources.jar!/"/>
-        </CLASSES>
-    </library>
-</component>
\ No newline at end of file
diff --git a/scalalib/src/test/resources/gen-idea/idea/libraries/modules_scala-xml_2.12_1.0.6_scala-xml_2.12-1.0.6.jar.xml b/scalalib/src/test/resources/gen-idea/idea/libraries/modules_scala-xml_2.12_1.0.6_scala-xml_2.12-1.0.6.jar.xml
deleted file mode 100644
index 5e21f3f3..00000000
--- a/scalalib/src/test/resources/gen-idea/idea/libraries/modules_scala-xml_2.12_1.0.6_scala-xml_2.12-1.0.6.jar.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="libraryTable">
-    <library name="modules_scala-xml_2.12_1.0.6_scala-xml_2.12-1.0.6.jar">
-        <CLASSES>
-            <root url="jar:COURSIER_HOME/cache/v1/https/repo1.maven.org/maven2/org/scala-lang/modules/scala-xml_2.12/1.0.6/scala-xml_2.12-1.0.6.jar!/"/>
-        </CLASSES>
-    </library>
-</component>
\ No newline at end of file
diff --git a/scalalib/src/test/resources/gen-idea/idea/libraries/scala-compiler_2.12.4_scala-compiler-2.12.4-sources.jar.xml b/scalalib/src/test/resources/gen-idea/idea/libraries/scala-compiler_2.12.4_scala-compiler-2.12.4-sources.jar.xml
deleted file mode 100644
index fe9d533a..00000000
--- a/scalalib/src/test/resources/gen-idea/idea/libraries/scala-compiler_2.12.4_scala-compiler-2.12.4-sources.jar.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="libraryTable">
-    <library name="scala-compiler_2.12.4_scala-compiler-2.12.4-sources.jar">
-        <CLASSES>
-            <root url="jar:COURSIER_HOME/cache/v1/https/repo1.maven.org/maven2/org/scala-lang/scala-compiler/2.12.4/scala-compiler-2.12.4-sources.jar!/"/>
-        </CLASSES>
-    </library>
-</component>
\ No newline at end of file
diff --git a/scalalib/src/test/resources/gen-idea/idea/libraries/scala-compiler_2.12.4_scala-compiler-2.12.4.jar.xml b/scalalib/src/test/resources/gen-idea/idea/libraries/scala-compiler_2.12.4_scala-compiler-2.12.4.jar.xml
deleted file mode 100644
index ec0460d7..00000000
--- a/scalalib/src/test/resources/gen-idea/idea/libraries/scala-compiler_2.12.4_scala-compiler-2.12.4.jar.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="libraryTable">
-    <library name="scala-compiler_2.12.4_scala-compiler-2.12.4.jar">
-        <CLASSES>
-            <root url="jar:COURSIER_HOME/cache/v1/https/repo1.maven.org/maven2/org/scala-lang/scala-compiler/2.12.4/scala-compiler-2.12.4.jar!/"/>
-        </CLASSES>
-    </library>
-</component>
\ No newline at end of file
diff --git a/scalalib/src/test/resources/gen-idea/idea/libraries/scala-library_2.12.4_scala-library-2.12.4-sources.jar.xml b/scalalib/src/test/resources/gen-idea/idea/libraries/scala-library_2.12.4_scala-library-2.12.4-sources.jar.xml
deleted file mode 100644
index a1278e29..00000000
--- a/scalalib/src/test/resources/gen-idea/idea/libraries/scala-library_2.12.4_scala-library-2.12.4-sources.jar.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="libraryTable">
-    <library name="scala-library_2.12.4_scala-library-2.12.4-sources.jar">
-        <CLASSES>
-            <root url="jar:COURSIER_HOME/cache/v1/https/repo1.maven.org/maven2/org/scala-lang/scala-library/2.12.4/scala-library-2.12.4-sources.jar!/"/>
-        </CLASSES>
-    </library>
-</component>
\ No newline at end of file
diff --git a/scalalib/src/test/resources/gen-idea/idea/libraries/scala-library_2.12.4_scala-library-2.12.4.jar.xml b/scalalib/src/test/resources/gen-idea/idea/libraries/scala-library_2.12.4_scala-library-2.12.4.jar.xml
deleted file mode 100644
index bbd957f0..00000000
--- a/scalalib/src/test/resources/gen-idea/idea/libraries/scala-library_2.12.4_scala-library-2.12.4.jar.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="libraryTable">
-    <library name="scala-library_2.12.4_scala-library-2.12.4.jar">
-        <CLASSES>
-            <root url="jar:COURSIER_HOME/cache/v1/https/repo1.maven.org/maven2/org/scala-lang/scala-library/2.12.4/scala-library-2.12.4.jar!/"/>
-        </CLASSES>
-    </library>
-</component>
\ No newline at end of file
diff --git a/scalalib/src/test/resources/gen-idea/idea/libraries/scala-reflect_2.12.4_scala-reflect-2.12.4-sources.jar.xml b/scalalib/src/test/resources/gen-idea/idea/libraries/scala-reflect_2.12.4_scala-reflect-2.12.4-sources.jar.xml
deleted file mode 100644
index 09db75bb..00000000
--- a/scalalib/src/test/resources/gen-idea/idea/libraries/scala-reflect_2.12.4_scala-reflect-2.12.4-sources.jar.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="libraryTable">
-    <library name="scala-reflect_2.12.4_scala-reflect-2.12.4-sources.jar">
-        <CLASSES>
-            <root url="jar:COURSIER_HOME/cache/v1/https/repo1.maven.org/maven2/org/scala-lang/scala-reflect/2.12.4/scala-reflect-2.12.4-sources.jar!/"/>
-        </CLASSES>
-    </library>
-</component>
\ No newline at end of file
diff --git a/scalalib/src/test/resources/gen-idea/idea/libraries/scala-reflect_2.12.4_scala-reflect-2.12.4.jar.xml b/scalalib/src/test/resources/gen-idea/idea/libraries/scala-reflect_2.12.4_scala-reflect-2.12.4.jar.xml
deleted file mode 100644
index f23b80f6..00000000
--- a/scalalib/src/test/resources/gen-idea/idea/libraries/scala-reflect_2.12.4_scala-reflect-2.12.4.jar.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="libraryTable">
-    <library name="scala-reflect_2.12.4_scala-reflect-2.12.4.jar">
-        <CLASSES>
-            <root url="jar:COURSIER_HOME/cache/v1/https/repo1.maven.org/maven2/org/scala-lang/scala-reflect/2.12.4/scala-reflect-2.12.4.jar!/"/>
-        </CLASSES>
-    </library>
-</component>
\ No newline at end of file
diff --git a/scalalib/src/test/resources/gen-idea/idea/misc.xml b/scalalib/src/test/resources/gen-idea/idea/misc.xml
deleted file mode 100644
index 2726692f..00000000
--- a/scalalib/src/test/resources/gen-idea/idea/misc.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<project version="4">
-    <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8 (1)" project-jdk-type="JavaSDK">
-        <output url="file://$PROJECT_DIR$/target/idea_output"/>
-    </component>
-</project>
\ No newline at end of file
diff --git a/scalalib/src/test/resources/gen-idea/idea/modules.xml b/scalalib/src/test/resources/gen-idea/idea/modules.xml
deleted file mode 100644
index 374b9a1f..00000000
--- a/scalalib/src/test/resources/gen-idea/idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<project version="4">
-    <component name="ProjectModuleManager">
-        <modules>
-            <module fileurl="file://$PROJECT_DIR$/.idea_modules/root.iml" filepath="$PROJECT_DIR$/.idea_modules/root.iml"/>
-            <module fileurl="file://$PROJECT_DIR$/.idea_modules/.iml" filepath="$PROJECT_DIR$/.idea_modules/.iml"/>
-        </modules>
-    </component>
-</project>
\ No newline at end of file
diff --git a/scalalib/src/test/resources/gen-idea/idea_modules/iml b/scalalib/src/test/resources/gen-idea/idea_modules/iml
deleted file mode 100644
index 548865f1..00000000
--- a/scalalib/src/test/resources/gen-idea/idea_modules/iml
+++ /dev/null
@@ -1,22 +0,0 @@
-<module type="JAVA_MODULE" version="4">
-    <component name="NewModuleRootManager">
-        <output url="file://$MODULE_DIR$/../target/workspace/gen-idea/out/compile/dest/classes"/>
-        <exclude-output/>
-        <content url="file://$MODULE_DIR$/../target/workspace/hello-world/src/src">
-            <sourceFolder url="file://$MODULE_DIR$/../target/workspace/hello-world/src/src" isTestSource="false"/>
-        </content>
-        <content url="file://$MODULE_DIR$/../target/workspace/hello-world/src/resources">
-            <sourceFolder url="file://$MODULE_DIR$/../target/workspace/hello-world/src/resources" isTestSource="false" type="java-resource"/>
-        </content>
-        <orderEntry type="inheritedJdk"/>
-        <orderEntry type="sourceFolder" forTests="false"/>
-        <orderEntry type="library" name="modules_scala-xml_2.12_1.0.6_scala-xml_2.12-1.0.6-sources.jar" level="project"/>
-        <orderEntry type="library" name="modules_scala-xml_2.12_1.0.6_scala-xml_2.12-1.0.6.jar" level="project"/>
-        <orderEntry type="library" name="scala-compiler_2.12.4_scala-compiler-2.12.4-sources.jar" level="project"/>
-        <orderEntry type="library" name="scala-compiler_2.12.4_scala-compiler-2.12.4.jar" level="project"/>
-        <orderEntry type="library" name="scala-library_2.12.4_scala-library-2.12.4-sources.jar" level="project"/>
-        <orderEntry type="library" name="scala-library_2.12.4_scala-library-2.12.4.jar" level="project"/>
-        <orderEntry type="library" name="scala-reflect_2.12.4_scala-reflect-2.12.4-sources.jar" level="project"/>
-        <orderEntry type="library" name="scala-reflect_2.12.4_scala-reflect-2.12.4.jar" level="project"/>
-    </component>
-</module>
\ No newline at end of file
diff --git a/scalalib/src/test/resources/gen-idea/idea_modules/root.iml b/scalalib/src/test/resources/gen-idea/idea_modules/root.iml
deleted file mode 100644
index dcf5f7fc..00000000
--- a/scalalib/src/test/resources/gen-idea/idea_modules/root.iml
+++ /dev/null
@@ -1,9 +0,0 @@
-<module type="JAVA_MODULE" version="4">
-    <component name="NewModuleRootManager">
-        <output url="file://$MODULE_DIR$/../out"/>
-        <content url="file://$MODULE_DIR$/.."/>
-        <exclude-output/>
-        <orderEntry type="inheritedJdk"/>
-        <orderEntry type="sourceFolder" forTests="false"/>
-    </component>
-</module>
\ No newline at end of file
diff --git a/scalalib/src/test/resources/hello-world/src/main/scala/Main.scala b/scalalib/src/test/resources/hello-world/src/main/scala/Main.scala
deleted file mode 100644
index 14139d6f..00000000
--- a/scalalib/src/test/resources/hello-world/src/main/scala/Main.scala
+++ /dev/null
@@ -1,12 +0,0 @@
-import scala.collection._ // unused import to check unused imports warning
-import java.nio.file.{Files, Paths}
-
-object Main extends App {
-
-  val person = Person.fromString("rockjam:25")
-  val greeting = s"hello ${person.name}, your age is: ${person.age}"
-  println(greeting)
-  val resultPath = Paths.get(args(0))
-  Files.createDirectories(resultPath.getParent)
-  Files.write(resultPath, greeting.getBytes)
-}
diff --git a/scalalib/src/test/resources/hello-world/src/main/scala/Result.scala b/scalalib/src/test/resources/hello-world/src/main/scala/Result.scala
deleted file mode 100644
index d7d29a51..00000000
--- a/scalalib/src/test/resources/hello-world/src/main/scala/Result.scala
+++ /dev/null
@@ -1,7 +0,0 @@
-object Person {
-  def fromString(s: String): Person = {
-    val Array(name, age) = s.split(":")
-    Person(name, age.toInt)
-  }
-}
-case class Person(name: String, age: Int)
diff --git a/scalalib/src/test/scala/mill/scalalib/GenIdeaTests.scala b/scalalib/src/test/scala/mill/scalalib/GenIdeaTests.scala
deleted file mode 100644
index 36945f65..00000000
--- a/scalalib/src/test/scala/mill/scalalib/GenIdeaTests.scala
+++ /dev/null
@@ -1,78 +0,0 @@
-package mill.scalalib
-
-import ammonite.ops._
-import mill._
-
-import mill.util.{TestEvaluator, TestUtil}
-import utest._
-
-object GenIdeaTests extends TestSuite {
-
-  val basePath = pwd / 'target / 'workspace / "gen-idea"
-  val outPath = basePath / 'out
-  val workingSrcPath = basePath / 'src
-
-  trait HelloWorldModule extends scalalib.ScalaModule {
-    def scalaVersion = "2.12.4"
-    def basePath = HelloWorldTests.workingSrcPath
-  }
-
-  object HelloWorld extends TestUtil.BaseModule with HelloWorldModule
-
-  val helloWorldEvaluator = new TestEvaluator(
-    HelloWorld,
-    outPath,
-    workingSrcPath
-  )
-
-  def tests: Tests = Tests {
-    'genIdeaTests - {
-      helloWorldEvaluator(HelloWorld.scalaVersion)
-      val x = GenIdea.xmlFileLayout(helloWorldEvaluator.evaluator, HelloWorld)
-      val pp = new scala.xml.PrettyPrinter(999, 4)
-
-      for((relPath, xml) <- GenIdea.xmlFileLayout(helloWorldEvaluator.evaluator, HelloWorld)){
-        write.over(basePath/ "generated"/ relPath, pp.format(xml))
-      }
-
-      Seq(
-        "gen-idea/idea_modules/iml" ->
-          basePath / "generated" / ".idea_modules" /".iml",
-        "gen-idea/idea_modules/root.iml" ->
-          basePath / "generated" / ".idea_modules" /"root.iml",
-        "gen-idea/idea/libraries/scala-reflect_2.12.4_scala-reflect-2.12.4-sources.jar.xml" ->
-          basePath / "generated" / ".idea" / "libraries" / "scala-reflect_2.12.4_scala-reflect-2.12.4-sources.jar.xml",
-        "gen-idea/idea/libraries/scala-reflect_2.12.4_scala-reflect-2.12.4.jar.xml" ->
-          basePath / "generated" / ".idea" / "libraries" / "scala-reflect_2.12.4_scala-reflect-2.12.4.jar.xml",
-        "gen-idea/idea/libraries/scala-library_2.12.4_scala-library-2.12.4.jar.xml" ->
-          basePath / "generated" / ".idea" / "libraries" / "scala-library_2.12.4_scala-library-2.12.4.jar.xml",
-        "gen-idea/idea/libraries/modules_scala-xml_2.12_1.0.6_scala-xml_2.12-1.0.6.jar.xml" ->
-          basePath / "generated" / ".idea" / "libraries" / "modules_scala-xml_2.12_1.0.6_scala-xml_2.12-1.0.6.jar.xml",
-        "gen-idea/idea/libraries/modules_scala-xml_2.12_1.0.6_scala-xml_2.12-1.0.6-sources.jar.xml" ->
-          basePath / "generated" / ".idea" / "libraries" / "modules_scala-xml_2.12_1.0.6_scala-xml_2.12-1.0.6-sources.jar.xml",
-        "gen-idea/idea/libraries/scala-compiler_2.12.4_scala-compiler-2.12.4-sources.jar.xml" ->
-          basePath / "generated" / ".idea" / "libraries" / "scala-compiler_2.12.4_scala-compiler-2.12.4-sources.jar.xml",
-        "gen-idea/idea/libraries/scala-library_2.12.4_scala-library-2.12.4-sources.jar.xml" ->
-          basePath / "generated" / ".idea" / "libraries" / "scala-library_2.12.4_scala-library-2.12.4-sources.jar.xml",
-        "gen-idea/idea/libraries/scala-compiler_2.12.4_scala-compiler-2.12.4.jar.xml" ->
-          basePath / "generated" / ".idea" / "libraries" / "scala-compiler_2.12.4_scala-compiler-2.12.4.jar.xml",
-        "gen-idea/idea/modules.xml" ->
-          basePath / "generated" / ".idea" / "modules.xml",
-        "gen-idea/idea/misc.xml" ->
-          basePath / "generated" / ".idea" / "misc.xml",
-      ).foreach { case (resource, generated) =>
-          println("checking "+resource)
-          val resourceString = scala.io.Source.fromResource(resource).getLines().mkString("\n")
-          val generatedString = normaliseLibraryPaths(read! generated)
-
-          assert(resourceString == generatedString)
-        }
-    }
-  }
-
-
-  private val libPathRegex =  """([\w/]+)/.coursier""".r
-  private def normaliseLibraryPaths(in: String): String = {
-    libPathRegex.replaceAllIn(in, "COURSIER_HOME")
-  }
-}
diff --git a/scalalib/src/test/scala/mill/scalalib/HelloWorldTests.scala b/scalalib/src/test/scala/mill/scalalib/HelloWorldTests.scala
deleted file mode 100644
index 7444604b..00000000
--- a/scalalib/src/test/scala/mill/scalalib/HelloWorldTests.scala
+++ /dev/null
@@ -1,400 +0,0 @@
-package mill.scalalib
-
-import java.util.jar.JarFile
-
-import ammonite.ops._
-import ammonite.ops.ImplicitWd._
-import mill._
-import mill.define.Target
-import mill.eval.{Evaluator, Result}
-import mill.scalalib.publish._
-import mill.util.{TestEvaluator, TestUtil}
-import sbt.internal.inc.CompileFailed
-import utest._
-
-import scala.collection.JavaConverters._
-
-
-object HelloWorldTests extends TestSuite {
-  trait HelloWorldModule extends scalalib.ScalaModule {
-    def scalaVersion = "2.12.4"
-    def basePath = HelloWorldTests.workingSrcPath
-  }
-
-  object HelloWorld extends TestUtil.BaseModule with HelloWorldModule
-  object CrossHelloWorld extends TestUtil.BaseModule {
-    object cross extends Cross[HelloWorldCross]("2.10.6", "2.11.11", "2.12.3", "2.12.4")
-    class HelloWorldCross(v: String) extends HelloWorldModule {
-      def scalaVersion = v
-    }
-  }
-
-  object HelloWorldWithMain extends TestUtil.BaseModule with HelloWorldModule {
-    def mainClass = Some("Main")
-  }
-
-  object HelloWorldWithMainAssembly extends TestUtil.BaseModule with HelloWorldModule {
-    def mainClass = Some("Main")
-    def assembly = T{
-      mill.modules.Jvm.createAssembly(
-        runClasspath().map(_.path).filter(exists),
-        prependShellScript = prependShellScript(),
-        mainClass = mainClass()
-      )
-    }
-  }
-
-  object HelloWorldWarnUnused extends TestUtil.BaseModule with HelloWorldModule {
-    def scalacOptions = T(Seq("-Ywarn-unused"))
-  }
-
-  object HelloWorldFatalWarnings extends TestUtil.BaseModule with HelloWorldModule {
-    def scalacOptions = T(Seq("-Ywarn-unused", "-Xfatal-warnings"))
-  }
-
-  object HelloWorldWithPublish extends TestUtil.BaseModule with HelloWorldModule with PublishModule {
-    def artifactName = "hello-world"
-    def publishVersion = "0.0.1"
-
-    def pomSettings = PomSettings(
-      organization = "com.lihaoyi",
-      description = "hello world ready for real world publishing",
-      url = "https://github.com/lihaoyi/hello-world-publish",
-      licenses = Seq(
-        License("Apache License, Version 2.0",
-          "http://www.apache.org/licenses/LICENSE-2.0")),
-      scm = SCM(
-        "https://github.com/lihaoyi/hello-world-publish",
-        "scm:git:https://github.com/lihaoyi/hello-world-publish"
-      ),
-      developers =
-        Seq(Developer("lihaoyi", "Li Haoyi", "https://github.com/lihaoyi"))
-    )
-  }
-  object HelloWorldScalaOverride extends TestUtil.BaseModule with HelloWorldModule {
-    override def scalaVersion: Target[String] = "2.11.11"
-  }
-  val srcPath = pwd / 'scalalib / 'src / 'test / 'resources / "hello-world"
-  val basePath = pwd / 'target / 'workspace / "hello-world"
-  val workingSrcPath = basePath / 'src
-  val outPath = basePath / 'out
-  val mainObject = workingSrcPath / 'src / 'main / 'scala / "Main.scala"
-
-
-
-
-  val helloWorldEvaluator = new TestEvaluator(
-    HelloWorld,
-    outPath,
-    workingSrcPath
-  )
-  val helloWorldWithMainEvaluator = new TestEvaluator(
-    HelloWorldWithMain,
-    outPath,
-    workingSrcPath
-  )
-  val helloWorldWithMainAssemblyEvaluator = new TestEvaluator(
-    HelloWorldWithMainAssembly,
-    outPath,
-    workingSrcPath
-  )
-  val helloWorldFatalEvaluator = new TestEvaluator(
-    HelloWorldFatalWarnings,
-    outPath,
-    workingSrcPath
-  )
-  val helloWorldOverrideEvaluator = new TestEvaluator(
-    HelloWorldScalaOverride,
-    outPath,
-    workingSrcPath
-  )
-  val helloWorldCrossEvaluator = new TestEvaluator(
-    CrossHelloWorld,
-    outPath,
-    workingSrcPath
-  )
-
-
-  def tests: Tests = Tests {
-    prepareWorkspace()
-    'scalaVersion - {
-      'fromBuild - {
-        val Right((result, evalCount)) = helloWorldEvaluator(HelloWorld.scalaVersion)
-
-        assert(
-          result == "2.12.4",
-          evalCount > 0
-        )
-      }
-      'override - {
-        val Right((result, evalCount)) = helloWorldOverrideEvaluator(HelloWorldScalaOverride.scalaVersion)
-
-        assert(
-          result == "2.11.11",
-          evalCount > 0
-        )
-      }
-    }
-    'scalacOptions - {
-      'emptyByDefault - {
-        val Right((result, evalCount)) = helloWorldEvaluator(HelloWorld.scalacOptions)
-
-        assert(
-          result.isEmpty,
-          evalCount > 0
-        )
-      }
-      'override - {
-        val Right((result, evalCount)) = helloWorldFatalEvaluator(HelloWorldFatalWarnings.scalacOptions)
-
-        assert(
-          result == Seq("-Ywarn-unused", "-Xfatal-warnings"),
-          evalCount > 0
-        )
-      }
-    }
-    'compile - {
-      'fromScratch - {
-        val Right((result, evalCount)) = helloWorldEvaluator(HelloWorld.compile)
-
-        val analysisFile = result.analysisFile
-        val outputFiles = ls.rec(result.classes.path)
-        val expectedClassfiles = compileClassfiles.map(outPath / 'compile / 'dest / 'classes / _)
-        assert(
-          result.classes.path == outPath / 'compile / 'dest / 'classes,
-          exists(analysisFile),
-          outputFiles.nonEmpty,
-          outputFiles.forall(expectedClassfiles.contains),
-          evalCount > 0
-        )
-
-        // don't recompile if nothing changed
-        val Right((_, unchangedEvalCount)) = helloWorldEvaluator(HelloWorld.compile)
-        assert(unchangedEvalCount == 0)
-      }
-      'recompileOnChange - {
-        val Right((_, freshCount)) = helloWorldEvaluator(HelloWorld.compile)
-        assert(freshCount > 0)
-
-        write.append(mainObject, "\n")
-
-        val Right((_, incCompileCount)) = helloWorldEvaluator(HelloWorld.compile)
-        assert(incCompileCount > 0, incCompileCount < freshCount)
-      }
-      'failOnError - {
-        write.append(mainObject, "val x: ")
-
-        val Left(Result.Exception(err, _)) = helloWorldEvaluator(HelloWorld.compile)
-
-        assert(err.isInstanceOf[CompileFailed])
-
-        val paths = Evaluator.resolveDestPaths(
-          outPath,
-          HelloWorld.compile.ctx.segments
-        )
-
-        assert(
-          ls.rec(paths.dest / 'classes).isEmpty,
-          !exists(paths.meta)
-        )
-        // Works when fixed
-        write.over(mainObject, read(mainObject).dropRight("val x: ".length))
-
-        val Right((result, evalCount)) = helloWorldEvaluator(HelloWorld.compile)
-      }
-      'passScalacOptions - {
-        // compilation fails because of "-Xfatal-warnings" flag
-        val Left(Result.Exception(err, _)) = helloWorldFatalEvaluator(HelloWorldFatalWarnings.compile)
-
-        assert(err.isInstanceOf[CompileFailed])
-      }
-    }
-    'runMain - {
-      'runMainObject - {
-        val runResult = basePath / 'out / 'runMain / 'dest / "hello-mill"
-
-        val Right((_, evalCount)) = helloWorldEvaluator(HelloWorld.runMain("Main", runResult.toString))
-        assert(evalCount > 0)
-
-        assert(
-          exists(runResult),
-          read(runResult) == "hello rockjam, your age is: 25"
-        )
-      }
-      'runCross{
-        def cross(v: String) {
-
-          val runResult = basePath / 'out / 'cross / v / 'runMain / 'dest / "hello-mill"
-
-          val Right((_, evalCount)) = helloWorldCrossEvaluator(
-            CrossHelloWorld.cross(v).runMain("Main", runResult.toString)
-          )
-
-          assert(evalCount > 0)
-
-
-          assert(
-            exists(runResult),
-            read(runResult) == "hello rockjam, your age is: 25"
-          )
-        }
-        'v210 - cross("2.10.6")
-        'v211 - cross("2.11.11")
-        'v2123 - cross("2.12.3")
-        'v2124 - cross("2.12.4")
-      }
-
-
-      'notRunInvalidMainObject - {
-        val Left(Result.Exception(err, _)) = helloWorldEvaluator(HelloWorld.runMain("Invalid"))
-
-        assert(
-          err.isInstanceOf[InteractiveShelloutException]
-        )
-      }
-      'notRunWhenComplileFailed - {
-        write.append(mainObject, "val x: ")
-
-        val Left(Result.Exception(err, _)) = helloWorldEvaluator(HelloWorld.runMain("Main"))
-
-        assert(
-          err.isInstanceOf[CompileFailed]
-        )
-      }
-    }
-
-    'forkRun - {
-      'runIfMainClassProvided - {
-        val runResult = basePath / 'out / 'run / 'dest / "hello-mill"
-        val Right((_, evalCount)) = helloWorldWithMainEvaluator(
-          HelloWorldWithMain.forkRun(runResult.toString)
-        )
-
-        assert(evalCount > 0)
-
-
-        assert(
-          exists(runResult),
-          read(runResult) == "hello rockjam, your age is: 25"
-        )
-      }
-      'notRunWithoutMainClass - {
-        val Left(Result.Exception(err, _)) = helloWorldEvaluator(HelloWorld.forkRun())
-
-        assert(
-          err.isInstanceOf[RuntimeException]
-        )
-      }
-    }
-    'run - {
-      'runIfMainClassProvided - {
-        val runResult = basePath / 'out / 'run / 'dest / "hello-mill"
-        val Right((_, evalCount)) = helloWorldWithMainEvaluator(
-          HelloWorldWithMain.run(runResult.toString)
-        )
-
-        assert(evalCount > 0)
-
-
-        assert(
-          exists(runResult),
-          read(runResult) == "hello rockjam, your age is: 25"
-        )
-      }
-      'notRunWithoutMainClass - {
-        val Left(Result.Exception(err, _)) = helloWorldEvaluator(HelloWorld.run())
-
-        assert(
-          err.isInstanceOf[RuntimeException]
-        )
-      }
-    }
-    'jar - {
-      'nonEmpty - {
-        val Right((result, evalCount)) = helloWorldWithMainEvaluator(HelloWorldWithMain.jar)
-
-        assert(
-          exists(result.path),
-          evalCount > 0
-        )
-
-        val jarFile = new JarFile(result.path.toIO)
-        val entries = jarFile.entries().asScala.map(_.getName).toSet
-
-        val manifestFiles = Seq[RelPath](
-          "META-INF" / "MANIFEST.MF"
-        )
-        val expectedFiles = compileClassfiles ++ manifestFiles
-
-        assert(
-          entries.nonEmpty,
-          entries == expectedFiles.map(_.toString()).toSet
-        )
-
-        val mainClass = jarMainClass(jarFile)
-        assert(mainClass.contains("Main"))
-      }
-      'logOutputToFile {
-        helloWorldEvaluator(HelloWorld.compile)
-
-        val logFile = outPath / 'compile / 'log
-        assert(exists(logFile))
-      }
-    }
-    'assembly - {
-      'assembly - {
-        val Right((result, evalCount)) = helloWorldWithMainAssemblyEvaluator(HelloWorldWithMainAssembly.assembly)
-        assert(
-          exists(result.path),
-          evalCount > 0
-        )
-        val jarFile = new JarFile(result.path.toIO)
-        val entries = jarFile.entries().asScala.map(_.getName).toSet
-
-        assert(entries.contains("Main.class"))
-        assert(entries.exists(s => s.contains("scala/Predef.class")))
-
-        val mainClass = jarMainClass(jarFile)
-        assert(mainClass.contains("Main"))
-      }
-      'run - {
-        val Right((result, evalCount)) = helloWorldWithMainAssemblyEvaluator(HelloWorldWithMainAssembly.assembly)
-
-        assert(
-          exists(result.path),
-          evalCount > 0
-        )
-        val runResult = basePath / "hello-mill"
-
-        %%("java", "-jar", result.path, runResult)(wd = basePath)
-
-        assert(
-          exists(runResult),
-          read(runResult) == "hello rockjam, your age is: 25"
-        )
-      }
-    }
-  }
-
-  def jarMainClass(jar: JarFile): Option[String] = {
-    import java.util.jar.Attributes._
-    val attrs = jar.getManifest.getMainAttributes.asScala
-    attrs.get(Name.MAIN_CLASS).map(_.asInstanceOf[String])
-  }
-
-  def compileClassfiles = Seq[RelPath](
-    "Main.class",
-    "Main$.class",
-    "Main$delayedInit$body.class",
-    "Person.class",
-    "Person$.class"
-  )
-
-  def prepareWorkspace(): Unit = {
-    rm(outPath)
-    rm(workingSrcPath)
-    mkdir(outPath)
-    cp(srcPath, workingSrcPath)
-  }
-
-}
diff --git a/scalalib/src/test/scala/mill/scalalib/ResolveDepsTests.scala b/scalalib/src/test/scala/mill/scalalib/ResolveDepsTests.scala
deleted file mode 100644
index d1ddde20..00000000
--- a/scalalib/src/test/scala/mill/scalalib/ResolveDepsTests.scala
+++ /dev/null
@@ -1,40 +0,0 @@
-package mill.scalalib
-
-import coursier.Cache
-import coursier.maven.MavenRepository
-import mill.eval.Result.{Failure, Success}
-import mill.eval.{PathRef, Result}
-import mill.util.Loose.Agg
-import utest._
-
-object ResolveDepsTests extends TestSuite {
-  val repos = Seq(Cache.ivy2Local, MavenRepository("https://repo1.maven.org/maven2"))
-
-  def evalDeps(deps: Agg[Dep]): Result[Agg[PathRef]] = Lib.resolveDependencies(repos, "2.12.4", "2.12", deps)
-
-  val tests = Tests {
-    'resolveValidDeps - {
-      val deps = Agg(ivy"com.lihaoyi::pprint:0.5.3")
-      val Success(paths) = evalDeps(deps)
-      assert(paths.nonEmpty)
-    }
-
-    'errOnInvalidOrgDeps - {
-      val deps = Agg(ivy"xxx.yyy.invalid::pprint:0.5.3")
-      val Failure(errMsg) = evalDeps(deps)
-      assert(errMsg.contains("xxx.yyy.invalid"))
-    }
-
-    'errOnInvalidVersionDeps - {
-      val deps = Agg(ivy"com.lihaoyi::pprint:invalid.version.num")
-      val Failure(errMsg) = evalDeps(deps)
-      assert(errMsg.contains("invalid.version.num"))
-    }
-
-    'errOnPartialSuccess - {
-      val deps = Agg(ivy"com.lihaoyi::pprint:0.5.3", ivy"fake::fake:fake")
-      val Failure(errMsg) = evalDeps(deps)
-      assert(errMsg.contains("fake"))
-    }
-  }
-}