mirror of https://github.com/sbt/sbt.git
Update sbt for latest zinc apis
This commit is contained in:
parent
88e0bd678a
commit
eb88d523e0
|
|
@ -14,6 +14,7 @@ import sbt.util.CacheStoreFactory
|
|||
import sbt.util.Logger
|
||||
import xsbti.Reporter
|
||||
import xsbti.compile.JavaTools
|
||||
import sbt.internal.inc.MappedFileConverter
|
||||
|
||||
object Doc {
|
||||
import RawCompileLike._
|
||||
|
|
@ -44,6 +45,7 @@ object Doc {
|
|||
classpath map { x =>
|
||||
PlainVirtualFile(x.toPath)
|
||||
},
|
||||
MappedFileConverter.empty,
|
||||
outputDirectory.toPath,
|
||||
options,
|
||||
maxErrors,
|
||||
|
|
|
|||
|
|
@ -215,7 +215,7 @@ object Defaults extends BuildCommon {
|
|||
) ++ serverHandlers.value :+ ServerHandler.fallback
|
||||
},
|
||||
timeWrappedStamper := Stamps
|
||||
.timeWrapLibraryStamps(Stamps.uncachedStamps(fileConverter.value), fileConverter.value),
|
||||
.timeWrapBinaryStamps(Stamps.uncachedStamps(fileConverter.value), fileConverter.value),
|
||||
reusableStamper := {
|
||||
val converter = fileConverter.value
|
||||
val unmanagedCache = unmanagedFileStampCache.value
|
||||
|
|
@ -1942,7 +1942,8 @@ object Defaults extends BuildCommon {
|
|||
compileOrder.value,
|
||||
None.toOptional: Optional[NioPath],
|
||||
Some(fileConverter.value).toOptional,
|
||||
Some(reusableStamper.value).toOptional
|
||||
Some(reusableStamper.value).toOptional,
|
||||
None.toOptional: Optional[xsbti.compile.Output],
|
||||
)
|
||||
},
|
||||
compilerReporter := {
|
||||
|
|
|
|||
|
|
@ -955,12 +955,7 @@ object BuiltinCommands {
|
|||
|
||||
def registerCompilerCache(s: State): State = {
|
||||
s.get(Keys.stateCompilerCache).foreach(_.clear())
|
||||
|
||||
val maxCompilers: Int = SysProp.residentLimit
|
||||
val cache =
|
||||
if (maxCompilers <= 0) CompilerCache.fresh
|
||||
else CompilerCache.createCacheFor(maxCompilers)
|
||||
s.put(Keys.stateCompilerCache, cache)
|
||||
s.put(Keys.stateCompilerCache, CompilerCache.fresh)
|
||||
}
|
||||
|
||||
def clearCaches: Command = {
|
||||
|
|
|
|||
|
|
@ -84,6 +84,7 @@ object SysProp {
|
|||
def watchMode: String =
|
||||
sys.props.get("sbt.watch.mode").getOrElse("auto")
|
||||
|
||||
@deprecated("Resident compilation is no longer supported", "1.4.0")
|
||||
def residentLimit: Int = int("sbt.resident.limit", 0)
|
||||
|
||||
/**
|
||||
|
|
|
|||
Loading…
Reference in New Issue