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

Merge pull request #3814 from dwijnand/avoid-log4j2-error-warning 

Make CaffeineCache a lazy val
This commit is contained in:
eugene yokota 2017-12-15 08:16:11 -05:00 committed by GitHub
parent 4248f5a0af 8bd522511d
commit 487d94d856
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
main/src/main/scala/sbt/Main.scala
View File

@ -103,7 +103,7 @@ object StandardMain {
private[sbt] lazy val exchange = new CommandExchange() private[sbt] lazy val exchange = new CommandExchange()
import scalacache._ import scalacache._
import scalacache.caffeine._ import scalacache.caffeine._
private[sbt] val cache: Cache[Any] = CaffeineCache[Any] private[sbt] lazy val cache: Cache[Any] = CaffeineCache[Any]
def runManaged(s: State): xsbti.MainResult = { def runManaged(s: State): xsbti.MainResult = {
val previous = TrapExit.installManager() val previous = TrapExit.installManager()
@ -135,9 +135,6 @@ object StandardMain {
Exec(x, None) Exec(x, None)
} }
val initAttrs = BuiltinCommands.initialAttributes val initAttrs = BuiltinCommands.initialAttributes
import scalacache.modes.scalaFuture._
import scala.concurrent.ExecutionContext.Implicits.global
cache.removeAll()
val s = State( val s = State(
configuration, configuration,
initialDefinitions, initialDefinitions,