luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Address reviews

This commit is contained in:
Eugene Yokota 2024-12-16 22:22:33 -05:00
parent 5ece24ad53
commit 12db63951b
4 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/nightly.yml vendored
View File

@ -32,7 +32,7 @@ jobs:
uses: actions/checkout@v4 uses: actions/checkout@v4
with: with:
repository: sbt/zinc repository: sbt/zinc
ref: 1.10.x ref: develop
path: zinc path: zinc
- name: Setup JDK - name: Setup JDK
uses: actions/setup-java@v4 uses: actions/setup-java@v4

2
build.sbt
View File

@ -47,7 +47,7 @@ ThisBuild / libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml"
Global / semanticdbEnabled := !(Global / insideCI).value Global / semanticdbEnabled := !(Global / insideCI).value
// Change main/src/main/scala/sbt/plugins/SemanticdbPlugin.scala too, if you change this. // 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") val excludeLint = SettingKey[Set[Def.KeyedInitialize[_]]]("excludeLintKeys")
Global / excludeLint := (Global / excludeLint).?.value.getOrElse(Set.empty) Global / excludeLint := (Global / excludeLint).?.value.getOrElse(Set.empty)
Global / excludeLint += Utils.componentID Global / excludeLint += Utils.componentID

2
main/src/main/scala/sbt/internal/AnalysisUtil.scala
View File

@ -34,8 +34,6 @@ private[sbt] object AnalysisUtil {
mappers = ReadWriteMappers.getEmptyMappers(), mappers = ReadWriteMappers.getEmptyMappers(),
sort = true, sort = true,
ec = scala.concurrent.ExecutionContext.global, ec = scala.concurrent.ExecutionContext.global,
// reproducisble = true will wipe out the timestamp, which we need for sbt 1.x
// reproducible = false,
parallelism = parallelism, parallelism = parallelism,
) )
} }

2
main/src/main/scala/sbt/internal/SysProp.scala
View File

@ -155,8 +155,6 @@ object SysProp {
def useLog4J: Boolean = getOrFalse("sbt.log.uselog4j") def useLog4J: Boolean = getOrFalse("sbt.log.uselog4j")
def turbo: Boolean = getOrFalse("sbt.turbo") def turbo: Boolean = getOrFalse("sbt.turbo")
def pipelining: Boolean = getOrFalse("sbt.pipelining") 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 taskTimings: Boolean = getOrFalse("sbt.task.timings")
def taskTimingsOnShutdown: Boolean = getOrFalse("sbt.task.timings.on.shutdown") def taskTimingsOnShutdown: Boolean = getOrFalse("sbt.task.timings.on.shutdown")