From 1ec08180f791fab8aecd8fd8151f238afb2b3a05 Mon Sep 17 00:00:00 2001
From: friendseeker <66892505+Friendseeker@users.noreply.github.com>
Date: Sat, 16 Nov 2024 13:36:15 -0800
Subject: [PATCH] Remove enableConsistentCompileAnalysis &
 enableBinaryCompileAnalysis

---
 main/src/main/scala/sbt/Defaults.scala             | 14 +++-----------
 main/src/main/scala/sbt/Keys.scala                 |  2 --
 .../src/main/scala/sbt/internal/AnalysisUtil.scala |  2 +-
 main/src/main/scala/sbt/internal/SysProp.scala     |  2 --
 .../scala/sbt/internal/server/Definition.scala     |  4 ++--
 5 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala
index 056da3523..5755affc8 100644
--- a/main/src/main/scala/sbt/Defaults.scala
+++ b/main/src/main/scala/sbt/Defaults.scala
@@ -867,14 +867,6 @@ object Defaults extends BuildCommon {
     }
   }
 
-  def defaultCompileSettings: Seq[Setting[?]] =
-    globalDefaults(
-      Seq(
-        enableBinaryCompileAnalysis :== true,
-        enableConsistentCompileAnalysis :== SysProp.analysis2024,
-      )
-    )
-
   lazy val configTasks: Seq[Setting[?]] = docTaskSettings(doc) ++
     inTask(compile)(compileInputsSettings) ++
     inTask(compileJava)(
@@ -893,7 +885,7 @@ object Defaults extends BuildCommon {
         }
       )
     ) ++
-    configGlobal ++ defaultCompileSettings ++ compileAnalysisSettings ++ Seq(
+    configGlobal ++ compileAnalysisSettings ++ Seq(
       compileOutputs := {
         import scala.jdk.CollectionConverters.*
         val c = fileConverter.value
@@ -2530,8 +2522,8 @@ object Defaults extends BuildCommon {
 
   private inline def analysisStore(inline analysisFile: TaskKey[File]): AnalysisStore =
     MixedAnalyzingCompiler.staticCachedStore(
-      analysisFile.value.toPath,
-      !enableBinaryCompileAnalysis.value
+      analysisFile = analysisFile.value.toPath,
+      useTextAnalysis = false,
     )
 
   def printWarningsTask: Initialize[Task[Unit]] =
diff --git a/main/src/main/scala/sbt/Keys.scala b/main/src/main/scala/sbt/Keys.scala
index 93ed52e72..0c1c39c06 100644
--- a/main/src/main/scala/sbt/Keys.scala
+++ b/main/src/main/scala/sbt/Keys.scala
@@ -237,8 +237,6 @@ object Keys {
   val scalaCompilerBridgeSource = settingKey[ModuleID]("Configures the module ID of the sources of the compiler bridge when scalaCompilerBridgeBinaryJar is None").withRank(CSetting)
   val scalaCompilerBridgeScope = taskKey[Unit]("The compiler bridge scope.").withRank(DTask)
   val scalaArtifacts = settingKey[Seq[String]]("Configures the list of artifacts which should match the Scala binary version").withRank(CSetting)
-  val enableBinaryCompileAnalysis = settingKey[Boolean]("Writes the analysis file in binary format").withRank(DSetting)
-  val enableConsistentCompileAnalysis = settingKey[Boolean]("Writes the analysis file in consistent binary format").withRank(DSetting)
   val crossJavaVersions = settingKey[Seq[String]]("The java versions used during JDK cross testing").withRank(BPlusSetting)
   val semanticdbEnabled = settingKey[Boolean]("Enables SemanticDB Scalac plugin").withRank(CSetting)
   val semanticdbCompilerPlugin = settingKey[ModuleID]("SemanticDB Scalac plugin").withRank(CSetting)
diff --git a/main/src/main/scala/sbt/internal/AnalysisUtil.scala b/main/src/main/scala/sbt/internal/AnalysisUtil.scala
index d200ddfde..f7a143d95 100644
--- a/main/src/main/scala/sbt/internal/AnalysisUtil.scala
+++ b/main/src/main/scala/sbt/internal/AnalysisUtil.scala
@@ -31,7 +31,7 @@ private[sbt] object AnalysisUtil {
     MixedAnalyzingCompiler.staticCachedStore(
       analysisFile = analysisFile,
       useTextAnalysis = useTextAnalysis,
-      useConsistent = false,
+      useConsistent = useConsistent,
       mappers = ReadWriteMappers.getEmptyMappers(),
       sort = true,
       ec = ExecutionContext.global,
diff --git a/main/src/main/scala/sbt/internal/SysProp.scala b/main/src/main/scala/sbt/internal/SysProp.scala
index e7e384795..6c36266b7 100644
--- a/main/src/main/scala/sbt/internal/SysProp.scala
+++ b/main/src/main/scala/sbt/internal/SysProp.scala
@@ -155,8 +155,6 @@ object SysProp {
   def useLog4J: Boolean = getOrFalse("sbt.log.uselog4j")
   def turbo: Boolean = getOrFalse("sbt.turbo")
   def pipelining: Boolean = getOrFalse("sbt.pipelining")
-  // opt-in or out of Zinc's consistent Analysis format.
-  def analysis2024: Boolean = getOrTrue("sbt.analysis2024")
 
   def taskTimings: Boolean = getOrFalse("sbt.task.timings")
   def taskTimingsOnShutdown: Boolean = getOrFalse("sbt.task.timings.on.shutdown")
diff --git a/main/src/main/scala/sbt/internal/server/Definition.scala b/main/src/main/scala/sbt/internal/server/Definition.scala
index 195a62b83..860bc82d7 100644
--- a/main/src/main/scala/sbt/internal/server/Definition.scala
+++ b/main/src/main/scala/sbt/internal/server/Definition.scala
@@ -213,8 +213,8 @@ private[sbt] object Definition {
     s.log.debug(s"analysis location ${cacheFile}")
     updateCache(AnalysesAccess.cache)(
       cacheFile = cacheFile,
-      useBinary = enableBinaryCompileAnalysis.value,
-      useConsistent = enableConsistentCompileAnalysis.value,
+      useBinary = true,
+      useConsistent = true,
     )
   }