From 8e13a43f485328ba5b0ec2b5fc89f9f7c374be71 Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Wed, 18 Dec 2024 00:24:44 -0500
Subject: [PATCH 1/2] Zinc 2.0.0-M3

---
 build.sbt                                           | 7 +++++--
 main/src/main/scala/sbt/internal/AnalysisUtil.scala | 3 +--
 project/Dependencies.scala                          | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/build.sbt b/build.sbt
index 663420cdb..14867c049 100644
--- a/build.sbt
+++ b/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
diff --git a/main/src/main/scala/sbt/internal/AnalysisUtil.scala b/main/src/main/scala/sbt/internal/AnalysisUtil.scala
index 0948e7a41..d49041497 100644
--- a/main/src/main/scala/sbt/internal/AnalysisUtil.scala
+++ b/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,
-      ec = scala.concurrent.ExecutionContext.global,
+      reproducible = true,
       parallelism = parallelism,
     )
 }
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index e58289d29..4498ae381 100644
--- a/project/Dependencies.scala
+++ b/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
 

From 896dc6220db1ae09062b32397069506bc02f0cd5 Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Wed, 18 Dec 2024 00:43:39 -0500
Subject: [PATCH 2/2] Mark false-error test pending

---
 .../sbt-test/source-dependencies/false-error/{test => pending}    | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename sbt-app/src/sbt-test/source-dependencies/false-error/{test => pending} (100%)

diff --git a/sbt-app/src/sbt-test/source-dependencies/false-error/test b/sbt-app/src/sbt-test/source-dependencies/false-error/pending
similarity index 100%
rename from sbt-app/src/sbt-test/source-dependencies/false-error/test
rename to sbt-app/src/sbt-test/source-dependencies/false-error/pending