From efe2a83c73565ac49b31fcb1b08ac804ffc33776 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Sat, 30 Nov 2024 00:05:26 -0500 Subject: [PATCH] Zinc 1.10.5 --- main/src/main/scala/sbt/internal/AnalysisUtil.scala | 3 ++- project/Dependencies.scala | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/main/src/main/scala/sbt/internal/AnalysisUtil.scala b/main/src/main/scala/sbt/internal/AnalysisUtil.scala index 548af48ac..049e3cf5a 100644 --- a/main/src/main/scala/sbt/internal/AnalysisUtil.scala +++ b/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, ) } diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 5e1a13572..d34375260 100644 --- a/project/Dependencies.scala +++ b/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