From 12db63951b9a34c196622dbf7b8a7fdfe679435a Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Mon, 16 Dec 2024 22:22:33 -0500 Subject: [PATCH] Address reviews --- .github/workflows/nightly.yml | 2 +- build.sbt | 2 +- main/src/main/scala/sbt/internal/AnalysisUtil.scala | 2 -- main/src/main/scala/sbt/internal/SysProp.scala | 2 -- 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 469fbc8a0..1c9a644c3 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -32,7 +32,7 @@ jobs: uses: actions/checkout@v4 with: repository: sbt/zinc - ref: 1.10.x + ref: develop path: zinc - name: Setup JDK uses: actions/setup-java@v4 diff --git a/build.sbt b/build.sbt index e2dfb365a..663420cdb 100644 --- a/build.sbt +++ b/build.sbt @@ -47,7 +47,7 @@ ThisBuild / libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml" Global / semanticdbEnabled := !(Global / insideCI).value // Change main/src/main/scala/sbt/plugins/SemanticdbPlugin.scala too, if you change this. -Global / semanticdbVersion := "4.7.8" +Global / semanticdbVersion := "4.9.9" val excludeLint = SettingKey[Set[Def.KeyedInitialize[_]]]("excludeLintKeys") Global / excludeLint := (Global / excludeLint).?.value.getOrElse(Set.empty) Global / excludeLint += Utils.componentID diff --git a/main/src/main/scala/sbt/internal/AnalysisUtil.scala b/main/src/main/scala/sbt/internal/AnalysisUtil.scala index 0fcc982ea..0948e7a41 100644 --- a/main/src/main/scala/sbt/internal/AnalysisUtil.scala +++ b/main/src/main/scala/sbt/internal/AnalysisUtil.scala @@ -34,8 +34,6 @@ private[sbt] object AnalysisUtil { mappers = ReadWriteMappers.getEmptyMappers(), sort = true, ec = scala.concurrent.ExecutionContext.global, - // reproducisble = true will wipe out the timestamp, which we need for sbt 1.x - // reproducible = false, parallelism = parallelism, ) } diff --git a/main/src/main/scala/sbt/internal/SysProp.scala b/main/src/main/scala/sbt/internal/SysProp.scala index 50b62e7df..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 = getOrFalse("sbt.analysis2024") def taskTimings: Boolean = getOrFalse("sbt.task.timings") def taskTimingsOnShutdown: Boolean = getOrFalse("sbt.task.timings.on.shutdown")