35 files changed, 120 insertions, 96 deletions
diff --git a/scalalib/src/mill/scalalib/Dep.scala b/scalalib/src/Dep.scala
index 714fa21e..714fa21e 100644
--- a/scalalib/src/mill/scalalib/Dep.scala
+++ b/scalalib/src/Dep.scala
diff --git a/scalalib/src/mill/scalalib/Dependency.scala b/scalalib/src/Dependency.scala
index 0c589663..0c589663 100644
--- a/scalalib/src/mill/scalalib/Dependency.scala
+++ b/scalalib/src/Dependency.scala
diff --git a/scalalib/src/mill/scalalib/GenIdeaImpl.scala b/scalalib/src/GenIdeaImpl.scala
index 2d76d804..b8f9d35e 100644
--- a/scalalib/src/mill/scalalib/GenIdeaImpl.scala
+++ b/scalalib/src/GenIdeaImpl.scala
@@ -5,8 +5,8 @@ import coursier.{Cache, CoursierPaths, Repository}
 import mill.define._
 import mill.eval.{Evaluator, PathRef, Result}
 import mill.api.Ctx.{Home, Log}
-import mill.util.Strict.Agg
-import mill.util.{Loose, Strict}
+import mill.api.Strict.Agg
+import mill.api.{Loose, Strict}
 import mill.{T, scalalib}
 
 import scala.util.Try
@@ -43,7 +43,7 @@ object GenIdeaImpl {
     val evaluator = new Evaluator(ctx.home, os.pwd / 'out, os.pwd / 'out, rootModule, ctx.log)
 
     for((relPath, xml) <- xmlFileLayout(evaluator, rootModule, jdkInfo)){
-      os.write.over(os.pwd/relPath, pp.format(xml))
+      os.write.over(os.pwd/relPath, pp.format(xml), createFolders = true)
     }
   }
 
diff --git a/scalalib/src/mill/scalalib/JavaModule.scala b/scalalib/src/JavaModule.scala
index 78be8893..72c0a5a6 100644
--- a/scalalib/src/mill/scalalib/JavaModule.scala
+++ b/scalalib/src/JavaModule.scala
@@ -9,7 +9,7 @@ import mill.modules.{Assembly, Jvm}
 import mill.modules.Jvm.{createAssembly, createJar}
 import Lib._
 import mill.scalalib.publish.{Artifact, Scope}
-import mill.util.Loose.Agg
+import mill.api.Loose.Agg
 
 /**
   * Core configuration required to compile a single Scala compilation target
diff --git a/scalalib/src/mill/scalalib/Lib.scala b/scalalib/src/Lib.scala
index b8b253bd..b8b253bd 100644
--- a/scalalib/src/mill/scalalib/Lib.scala
+++ b/scalalib/src/Lib.scala
diff --git a/scalalib/src/mill/scalalib/MiscModule.scala b/scalalib/src/MiscModule.scala
index c6449d6e..bf64f1f3 100644
--- a/scalalib/src/mill/scalalib/MiscModule.scala
+++ b/scalalib/src/MiscModule.scala
@@ -4,7 +4,7 @@ package scalalib
 import mill.define.Cross.Resolver
 import mill.define.{Cross, Task}
 import mill.eval.{PathRef, Result}
-import mill.util.Loose.Agg
+import mill.api.Loose.Agg
 object CrossModuleBase{
   def scalaVersionPaths(scalaVersion: String, f: String => os.Path) = {
     for(segments <- scalaVersion.split('.').inits.filter(_.nonEmpty))
diff --git a/scalalib/src/mill/scalalib/PublishModule.scala b/scalalib/src/PublishModule.scala
index 588781f4..588781f4 100644
--- a/scalalib/src/mill/scalalib/PublishModule.scala
+++ b/scalalib/src/PublishModule.scala
diff --git a/scalalib/src/mill/scalalib/ScalaModule.scala b/scalalib/src/ScalaModule.scala
index 9d669bf4..5fad1664 100644
--- a/scalalib/src/mill/scalalib/ScalaModule.scala
+++ b/scalalib/src/ScalaModule.scala
@@ -8,7 +8,7 @@ import mill.modules.Jvm
 import mill.modules.Jvm.createJar
 import mill.scalalib.api.Util.isDotty
 import Lib._
-import mill.util.Loose.Agg
+import mill.api.Loose.Agg
 import mill.api.DummyInputStream
 
 /**
@@ -79,36 +79,7 @@ trait ScalaModule extends JavaModule { outer =>
 
   def scalaDocOptions = T{ scalacOptions() }
 
-  private val Milestone213 = raw"""2.13.(\d+)-M(\d+)""".r
 
-  def scalaCompilerBridgeSources = T {
-    val (scalaVersion0, scalaBinaryVersion0) = scalaVersion() match {
-      case Milestone213(_, _) => ("2.13.0-M2", "2.13.0-M2")
-      case _ => (scalaVersion(), mill.scalalib.api.Util.scalaBinaryVersion(scalaVersion()))
-    }
-
-    val (bridgeDep, bridgeName, bridgeVersion) =
-      if (isDotty(scalaVersion0)) {
-        val org = scalaOrganization()
-        val name = "dotty-sbt-bridge"
-        val version = scalaVersion()
-        (ivy"$org:$name:$version", name, version)
-      } else {
-        val org = "org.scala-sbt"
-        val name = "compiler-bridge"
-        val version = Versions.zinc
-        (ivy"$org::$name:$version", s"${name}_$scalaBinaryVersion0", version)
-      }
-
-    resolveDependencies(
-      repositories,
-      Lib.depToDependency(_, scalaVersion0, platformSuffix()),
-      Seq(bridgeDep),
-      sources = true
-    ).map(deps =>
-      mill.scalalib.api.Util.grepJar(deps.map(_.path), bridgeName, bridgeVersion, sources = true)
-    )
-  }
 
   /**
     * The local classpath of Scala compiler plugins on-disk; you can add
@@ -159,8 +130,8 @@ trait ScalaModule extends JavaModule { outer =>
       compileClasspath().map(_.path),
       javacOptions(),
       scalaVersion(),
+      scalaOrganization(),
       scalacOptions(),
-      scalaCompilerBridgeSources(),
       scalaCompilerClasspath().map(_.path),
       scalacPluginClasspath().map(_.path),
     )
@@ -187,7 +158,7 @@ trait ScalaModule extends JavaModule { outer =>
     else {
       zincWorker.worker().docJar(
         scalaVersion(),
-        scalaCompilerBridgeSources(),
+        scalaOrganization(),
         scalaCompilerClasspath().map(_.path),
         scalacPluginClasspath().map(_.path),
         files ++ options
diff --git a/scalalib/src/mill/scalalib/TestRunner.scala b/scalalib/src/TestRunner.scala
index 42e65d63..42e65d63 100644
--- a/scalalib/src/mill/scalalib/TestRunner.scala
+++ b/scalalib/src/TestRunner.scala
diff --git a/scalalib/src/mill/scalalib/Versions.scala b/scalalib/src/Versions.scala
index e3697abb..e3697abb 100644
--- a/scalalib/src/mill/scalalib/Versions.scala
+++ b/scalalib/src/Versions.scala
diff --git a/scalalib/src/ZincWorkerModule.scala b/scalalib/src/ZincWorkerModule.scala
new file mode 100644
index 00000000..97d84aaf
--- /dev/null
+++ b/scalalib/src/ZincWorkerModule.scala
@@ -0,0 +1,109 @@
+package mill.scalalib
+
+import coursier.Cache
+import coursier.maven.MavenRepository
+import mill.Agg
+import mill.T
+import mill.api.KeyedLockedCache
+import mill.define.{Discover, Worker}
+import mill.scalalib.Lib.resolveDependencies
+import mill.scalalib.api.Util.isDotty
+import mill.scalalib.api.ZincWorkerApi
+import mill.api.Loose
+import mill.util.JsonFormatters._
+
+object ZincWorkerModule extends mill.define.ExternalModule with ZincWorkerModule{
+  lazy val millDiscover = Discover[this.type]
+}
+trait ZincWorkerModule extends mill.Module{
+  def repositories = Seq(
+    Cache.ivy2Local,
+    MavenRepository("https://repo1.maven.org/maven2"),
+    MavenRepository("https://oss.sonatype.org/content/repositories/releases")
+  )
+
+  def classpath = T{
+    mill.modules.Util.millProjectModule("MILL_SCALA_WORKER", "mill-scalalib-worker", repositories)
+  }
+
+  def scalalibClasspath = T{
+    mill.modules.Util.millProjectModule("MILL_SCALA_LIB", "mill-scalalib", repositories)
+  }
+
+  def backgroundWrapperClasspath = T{
+    mill.modules.Util.millProjectModule(
+      "MILL_BACKGROUNDWRAPPER", "mill-scalalib-backgroundwrapper",
+      repositories, artifactSuffix = ""
+    )
+  }
+
+  def worker: Worker[mill.scalalib.api.ZincWorkerApi] = T.worker{
+    val cl = mill.api.ClassLoader.create(
+      classpath().map(_.path.toNIO.toUri.toURL).toVector,
+      getClass.getClassLoader
+    )
+    val cls = cl.loadClass("mill.scalalib.worker.ZincWorkerImpl")
+    val instance = cls.getConstructor(
+      classOf[
+        Either[
+          (ZincWorkerApi.Ctx, Array[os.Path], (String, String) => os.Path),
+          String => os.Path
+        ]
+      ],
+      classOf[(Agg[os.Path], String) => os.Path],
+      classOf[(Agg[os.Path], String) => os.Path],
+      classOf[KeyedLockedCache[_]]
+    )
+      .newInstance(
+        Left((
+          T.ctx(),
+          compilerInterfaceClasspath().map(_.path).toArray,
+          (x: String, y: String) => scalaCompilerBridgeSourceJar(x, y).asSuccess.get.value
+        )),
+        mill.scalalib.api.Util.grepJar(_, "scala-library", _, sources = false),
+        mill.scalalib.api.Util.grepJar(_, "scala-compiler", _, sources = false),
+        new KeyedLockedCache.RandomBoundedCache(1, 1)
+      )
+    instance.asInstanceOf[mill.scalalib.api.ZincWorkerApi]
+  }
+
+  private val Milestone213 = raw"""2.13.(\d+)-M(\d+)""".r
+  def scalaCompilerBridgeSourceJar(scalaVersion: String,
+                                   scalaOrganization: String) = {
+    val (scalaVersion0, scalaBinaryVersion0) = scalaVersion match {
+      case Milestone213(_, _) => ("2.13.0-M2", "2.13.0-M2")
+      case _ => (scalaVersion, mill.scalalib.api.Util.scalaBinaryVersion(scalaVersion))
+    }
+
+    val (bridgeDep, bridgeName, bridgeVersion) =
+      if (isDotty(scalaVersion0)) {
+        val org = scalaOrganization
+        val name = "dotty-sbt-bridge"
+        val version = scalaVersion
+        (ivy"$org:$name:$version", name, version)
+      } else {
+        val org = "org.scala-sbt"
+        val name = "compiler-bridge"
+        val version = Versions.zinc
+        (ivy"$org::$name:$version", s"${name}_$scalaBinaryVersion0", version)
+      }
+
+    resolveDependencies(
+      repositories,
+      Lib.depToDependency(_, scalaVersion0, ""),
+      Seq(bridgeDep),
+      sources = true
+    ).map(deps =>
+      mill.scalalib.api.Util.grepJar(deps.map(_.path), bridgeName, bridgeVersion, sources = true)
+    )
+  }
+
+  def compilerInterfaceClasspath = T{
+    resolveDependencies(
+      repositories,
+      Lib.depToDependency(_, "2.12.4", ""),
+      Seq(ivy"org.scala-sbt:compiler-interface:${Versions.zinc}")
+    )
+  }
+
+}
diff --git a/scalalib/src/mill/scalalib/dependency/DependencyUpdatesImpl.scala b/scalalib/src/dependency/DependencyUpdatesImpl.scala
index 3bb94202..3bb94202 100644
--- a/scalalib/src/mill/scalalib/dependency/DependencyUpdatesImpl.scala
+++ b/scalalib/src/dependency/DependencyUpdatesImpl.scala
diff --git a/scalalib/src/mill/scalalib/dependency/metadata/MavenMetadataLoader.scala b/scalalib/src/dependency/metadata/MavenMetadataLoader.scala
index 491911bf..491911bf 100644
--- a/scalalib/src/mill/scalalib/dependency/metadata/MavenMetadataLoader.scala
+++ b/scalalib/src/dependency/metadata/MavenMetadataLoader.scala
diff --git a/scalalib/src/mill/scalalib/dependency/metadata/MetadataLoader.scala b/scalalib/src/dependency/metadata/MetadataLoader.scala
index 20271f0e..20271f0e 100644
--- a/scalalib/src/mill/scalalib/dependency/metadata/MetadataLoader.scala
+++ b/scalalib/src/dependency/metadata/MetadataLoader.scala
diff --git a/scalalib/src/mill/scalalib/dependency/metadata/MetadataLoaderFactory.scala b/scalalib/src/dependency/metadata/MetadataLoaderFactory.scala
index 4495d6b0..4495d6b0 100644
--- a/scalalib/src/mill/scalalib/dependency/metadata/MetadataLoaderFactory.scala
+++ b/scalalib/src/dependency/metadata/MetadataLoaderFactory.scala
diff --git a/scalalib/src/mill/scalalib/dependency/updates/ModuleDependenciesUpdates.scala b/scalalib/src/dependency/updates/ModuleDependenciesUpdates.scala
index a989cd31..a989cd31 100644
--- a/scalalib/src/mill/scalalib/dependency/updates/ModuleDependenciesUpdates.scala
+++ b/scalalib/src/dependency/updates/ModuleDependenciesUpdates.scala
diff --git a/scalalib/src/mill/scalalib/dependency/updates/UpdatesFinder.scala b/scalalib/src/dependency/updates/UpdatesFinder.scala
index 3430592f..3430592f 100644
--- a/scalalib/src/mill/scalalib/dependency/updates/UpdatesFinder.scala
+++ b/scalalib/src/dependency/updates/UpdatesFinder.scala
diff --git a/scalalib/src/mill/scalalib/dependency/versions/ModuleDependenciesVersions.scala b/scalalib/src/dependency/versions/ModuleDependenciesVersions.scala
index 12d57059..12d57059 100644
--- a/scalalib/src/mill/scalalib/dependency/versions/ModuleDependenciesVersions.scala
+++ b/scalalib/src/dependency/versions/ModuleDependenciesVersions.scala
diff --git a/scalalib/src/mill/scalalib/dependency/versions/Version.scala b/scalalib/src/dependency/versions/Version.scala
index a2719023..a2719023 100644
--- a/scalalib/src/mill/scalalib/dependency/versions/Version.scala
+++ b/scalalib/src/dependency/versions/Version.scala
diff --git a/scalalib/src/mill/scalalib/dependency/versions/VersionParser.scala b/scalalib/src/dependency/versions/VersionParser.scala
index 10aebd73..10aebd73 100644
--- a/scalalib/src/mill/scalalib/dependency/versions/VersionParser.scala
+++ b/scalalib/src/dependency/versions/VersionParser.scala
diff --git a/scalalib/src/mill/scalalib/dependency/versions/VersionsFinder.scala b/scalalib/src/dependency/versions/VersionsFinder.scala
index a831ffc3..a9ecc763 100644
--- a/scalalib/src/mill/scalalib/dependency/versions/VersionsFinder.scala
+++ b/scalalib/src/dependency/versions/VersionsFinder.scala
@@ -5,7 +5,7 @@ import mill.eval.Evaluator
 import mill.scalalib.dependency.metadata.MetadataLoaderFactory
 import mill.scalalib.{Dep, JavaModule, Lib}
 import mill.api.Ctx.{Home, Log}
-import mill.util.{Loose, Strict}
+import mill.api.{Loose, Strict}
 
 private[dependency] object VersionsFinder {
 
diff --git a/scalalib/src/mill/scalalib/ZincWorkerModule.scala b/scalalib/src/mill/scalalib/ZincWorkerModule.scala
deleted file mode 100644
index 5ca824ce..00000000
--- a/scalalib/src/mill/scalalib/ZincWorkerModule.scala
+++ /dev/null
@@ -1,56 +0,0 @@
-package mill.scalalib
-
-import coursier.Cache
-import coursier.maven.MavenRepository
-import mill.Agg
-import mill.T
-import mill.define.{Discover, Worker}
-import mill.scalalib.Lib.resolveDependencies
-import mill.util.Loose
-import mill.util.JsonFormatters._
-
-object ZincWorkerModule extends mill.define.ExternalModule with ZincWorkerModule{
-  lazy val millDiscover = Discover[this.type]
-}
-trait ZincWorkerModule extends mill.Module{
-  def repositories = Seq(
-    Cache.ivy2Local,
-    MavenRepository("https://repo1.maven.org/maven2"),
-    MavenRepository("https://oss.sonatype.org/content/repositories/releases")
-  )
-
-  def classpath = T{
-    mill.modules.Util.millProjectModule("MILL_SCALA_WORKER", "mill-scalalib-worker", repositories)
-  }
-
-  def scalalibClasspath = T{
-    mill.modules.Util.millProjectModule("MILL_SCALA_LIB", "mill-scalalib", repositories)
-  }
-
-  def backgroundWrapperClasspath = T{
-    mill.modules.Util.millProjectModule(
-      "MILL_BACKGROUNDWRAPPER", "mill-scalalib-backgroundwrapper",
-      repositories, artifactSuffix = ""
-    )
-  }
-
-  def worker: Worker[mill.scalalib.api.ZincWorkerApi] = T.worker{
-    val cl = mill.api.ClassLoader.create(
-      classpath().map(_.path.toNIO.toUri.toURL).toVector,
-      getClass.getClassLoader
-    )
-    val cls = cl.loadClass("mill.scalalib.worker.ZincWorkerImpl")
-    val instance = cls.getConstructor(classOf[mill.api.Ctx], classOf[Array[String]])
-      .newInstance(T.ctx(), compilerInterfaceClasspath().map(_.path.toString).toArray[String])
-    instance.asInstanceOf[mill.scalalib.api.ZincWorkerApi]
-  }
-
-  def compilerInterfaceClasspath = T{
-    resolveDependencies(
-      repositories,
-      Lib.depToDependency(_, "2.12.4", ""),
-      Seq(ivy"org.scala-sbt:compiler-interface:${Versions.zinc}")
-    )
-  }
-
-}
diff --git a/scalalib/src/mill/scalalib/package.scala b/scalalib/src/package.scala
index 5a282e82..5a282e82 100644
--- a/scalalib/src/mill/scalalib/package.scala
+++ b/scalalib/src/package.scala
diff --git a/scalalib/src/mill/scalalib/publish/Ivy.scala b/scalalib/src/publish/Ivy.scala
index 22e26ff6..e06efadd 100644
--- a/scalalib/src/mill/scalalib/publish/Ivy.scala
+++ b/scalalib/src/publish/Ivy.scala
@@ -1,6 +1,6 @@
 package mill.scalalib.publish
 
-import mill.util.Loose.Agg
+import mill.api.Loose.Agg
 
 import scala.xml.PrettyPrinter
 
diff --git a/scalalib/src/mill/scalalib/publish/JsonFormatters.scala b/scalalib/src/publish/JsonFormatters.scala
index 8fc90632..8fc90632 100644
--- a/scalalib/src/mill/scalalib/publish/JsonFormatters.scala
+++ b/scalalib/src/publish/JsonFormatters.scala
diff --git a/scalalib/src/mill/scalalib/publish/Licence.scala b/scalalib/src/publish/Licence.scala
index 8838ef69..8838ef69 100644
--- a/scalalib/src/mill/scalalib/publish/Licence.scala
+++ b/scalalib/src/publish/Licence.scala
diff --git a/scalalib/src/mill/scalalib/publish/LocalPublisher.scala b/scalalib/src/publish/LocalPublisher.scala
index d9839831..d9839831 100644
--- a/scalalib/src/mill/scalalib/publish/LocalPublisher.scala
+++ b/scalalib/src/publish/LocalPublisher.scala
diff --git a/scalalib/src/mill/scalalib/publish/Pom.scala b/scalalib/src/publish/Pom.scala
index 57a0e196..a7f1f6fc 100644
--- a/scalalib/src/mill/scalalib/publish/Pom.scala
+++ b/scalalib/src/publish/Pom.scala
@@ -1,6 +1,6 @@
 package mill.scalalib.publish
 
-import mill.util.Loose.Agg
+import mill.api.Loose.Agg
 
 import scala.xml.{Atom, Elem, NodeSeq, PrettyPrinter}
 
diff --git a/scalalib/src/mill/scalalib/publish/SonatypeHttpApi.scala b/scalalib/src/publish/SonatypeHttpApi.scala
index 12defa93..12defa93 100644
--- a/scalalib/src/mill/scalalib/publish/SonatypeHttpApi.scala
+++ b/scalalib/src/publish/SonatypeHttpApi.scala
diff --git a/scalalib/src/mill/scalalib/publish/SonatypePublisher.scala b/scalalib/src/publish/SonatypePublisher.scala
index 1843943b..1843943b 100644
--- a/scalalib/src/mill/scalalib/publish/SonatypePublisher.scala
+++ b/scalalib/src/publish/SonatypePublisher.scala
diff --git a/scalalib/src/mill/scalalib/publish/VersionControl.scala b/scalalib/src/publish/VersionControl.scala
index aad38ac3..aad38ac3 100644
--- a/scalalib/src/mill/scalalib/publish/VersionControl.scala
+++ b/scalalib/src/publish/VersionControl.scala
diff --git a/scalalib/src/mill/scalalib/publish/package.scala b/scalalib/src/publish/package.scala
index 99eeec14..99eeec14 100644
--- a/scalalib/src/mill/scalalib/publish/package.scala
+++ b/scalalib/src/publish/package.scala
diff --git a/scalalib/src/mill/scalalib/publish/settings.scala b/scalalib/src/publish/settings.scala
index bca81cf0..bca81cf0 100644
--- a/scalalib/src/mill/scalalib/publish/settings.scala
+++ b/scalalib/src/publish/settings.scala
diff --git a/scalalib/src/mill/scalalib/scalafmt/ScalafmtModule.scala b/scalalib/src/scalafmt/ScalafmtModule.scala
index 6a81d975..6a81d975 100644
--- a/scalalib/src/mill/scalalib/scalafmt/ScalafmtModule.scala
+++ b/scalalib/src/scalafmt/ScalafmtModule.scala
diff --git a/scalalib/src/mill/scalalib/scalafmt/ScalafmtWorker.scala b/scalalib/src/scalafmt/ScalafmtWorker.scala
index 47d8375f..47d8375f 100644
--- a/scalalib/src/mill/scalalib/scalafmt/ScalafmtWorker.scala
+++ b/scalalib/src/scalafmt/ScalafmtWorker.scala