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

Merge pull request #7781 from eed3si9n/wip/bump_zinc 

deps: Zinc 1.10.3
This commit is contained in:
eugene yokota 2024-10-19 14:35:45 -04:00 committed by GitHub
parent 4b4b81527f 778cd09d08
commit 628efcd80a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,7 +11,6 @@ package internal
import java.nio.file.Path import java.nio.file.Path
import sbt.internal.inc.MixedAnalyzingCompiler import sbt.internal.inc.MixedAnalyzingCompiler
import scala.concurrent.ExecutionContext
import xsbti.compile.{ AnalysisStore => XAnalysisStore } import xsbti.compile.{ AnalysisStore => XAnalysisStore }
import xsbti.compile.analysis.ReadWriteMappers import xsbti.compile.analysis.ReadWriteMappers
@ -34,7 +33,6 @@ private[sbt] object AnalysisUtil {
useConsistent = false, useConsistent = false,
mappers = ReadWriteMappers.getEmptyMappers(), mappers = ReadWriteMappers.getEmptyMappers(),
sort = true, sort = true,
ec = ExecutionContext.global,
parallelism = parallelism, parallelism = parallelism,
) )
} }

2
project/Dependencies.scala
View File

@ -15,7 +15,7 @@ object Dependencies {
private val ioVersion = nightlyVersion.getOrElse("1.10.1") private val ioVersion = nightlyVersion.getOrElse("1.10.1")
private val lmVersion = private val lmVersion =
sys.props.get("sbt.build.lm.version").orElse(nightlyVersion).getOrElse("1.10.1") sys.props.get("sbt.build.lm.version").orElse(nightlyVersion).getOrElse("1.10.1")
val zincVersion = nightlyVersion.getOrElse("1.10.2") val zincVersion = nightlyVersion.getOrElse("1.10.3")
private val sbtIO = "org.scala-sbt" %% "io" % ioVersion private val sbtIO = "org.scala-sbt" %% "io" % ioVersion

0
sbt-app/src/sbt-test/source-dependencies/false-error/test → sbt-app/src/sbt-test/source-dependencies/false-error/pending
View File