Merge pull request #7954 from eed3si9n/wip/bump-zinc

[2.x] Zinc 2.0.0-M3

build.sbt

@@ -176,7 +176,10 @@ def mimaSettingsSince(versions: Seq[String]): Seq[Def.Setting[_]] = Def settings
 val scriptedSbtMimaSettings = Def.settings(mimaPreviousArtifacts := Set())
 
 lazy val sbtRoot: Project = (project in file("."))
-  .aggregate(allProjects.map(p => LocalProject(p.id)): _*)
+  .aggregate(
+    (allProjects diff Seq(lmCoursierShaded))
+      .map(p => LocalProject(p.id)): _*
+  )
   .settings(
     minimalSettings,
     onLoadMessage := {
@@ -1126,7 +1129,7 @@ lazy val lowerUtils = (project in (file("internal") / "lower"))
 lazy val upperModules = (project in (file("internal") / "upper"))
   .aggregate(
     ((allProjects diff lowerUtilProjects)
-      diff Seq(bundledLauncherProj)).map(p => LocalProject(p.id)): _*
+      diff Seq(bundledLauncherProj, lmCoursierShaded)).map(p => LocalProject(p.id)): _*
   )
   .settings(
     Utils.noPublish

main/src/main/scala/sbt/internal/AnalysisUtil.scala

@@ -32,8 +32,7 @@ private[sbt] object AnalysisUtil {
       useTextAnalysis = useTextAnalysis,
       useConsistent = useConsistent,
       mappers = ReadWriteMappers.getEmptyMappers(),
-      sort = true,
+      reproducible = true,
-      ec = scala.concurrent.ExecutionContext.global,
       parallelism = parallelism,
     )
 }

project/Dependencies.scala

@@ -14,7 +14,7 @@ object Dependencies {
 
   // sbt modules
   private val ioVersion = nightlyVersion.getOrElse("1.10.1")
-  val zincVersion = nightlyVersion.getOrElse("2.0.0-M1")
+  val zincVersion = nightlyVersion.getOrElse("2.0.0-M3")
 
   private val sbtIO = "org.scala-sbt" %% "io" % ioVersion