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

[1.x] Update to Zinc 1.10.5

main/src/main/scala/sbt/Defaults.scala

@@ -710,7 +710,20 @@ object Defaults extends BuildCommon {
       crossPaths.value
     ),
     cleanIvy := IvyActions.cleanCachedResolutionCache(ivyModule.value, streams.value.log),
-    clean := clean.dependsOn(cleanIvy).value,
+    clean := {
+      val _ = cleanIvy.value
+      try {
+        val store = AnalysisUtil.staticCachedStore(
+          analysisFile = (Compile / compileAnalysisFile).value.toPath,
+          useTextAnalysis = !(Compile / enableBinaryCompileAnalysis).value,
+          useConsistent = (Compile / enableConsistentCompileAnalysis).value,
+        )
+        store.clearCache()
+      } catch {
+        case NonFatal(_) => ()
+      }
+      clean.value
+    },
     scalaCompilerBridgeBinaryJar := Def.settingDyn {
       val sv = scalaVersion.value
       if (ScalaArtifacts.isScala3(sv) || VersionNumber(sv)

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

@@ -32,7 +32,8 @@ private[sbt] object AnalysisUtil {
       useTextAnalysis = useTextAnalysis,
       useConsistent = useConsistent,
       mappers = ReadWriteMappers.getEmptyMappers(),
-      sort = true,
+      // reproducisble = true will wipe out the timestamp, which we need for sbt 1.x
+      reproducible = false,
       parallelism = parallelism,
     )
 }

project/Dependencies.scala

@@ -14,8 +14,8 @@ object Dependencies {
   // sbt modules
   private val ioVersion = nightlyVersion.getOrElse("1.10.2")
   private val lmVersion =
-    sys.props.get("sbt.build.lm.version").orElse(nightlyVersion).getOrElse("1.10.2")
-  val zincVersion = nightlyVersion.getOrElse("1.10.4")
+    sys.props.get("sbt.build.lm.version").orElse(nightlyVersion).getOrElse("1.10.3")
+  val zincVersion = nightlyVersion.getOrElse("1.10.5")
 
   private val sbtIO = "org.scala-sbt" %% "io" % ioVersion