From c66eefcec9f478148efe170496566a3c36670507 Mon Sep 17 00:00:00 2001 From: Benjy Date: Wed, 23 Oct 2013 10:41:13 -0400 Subject: [PATCH] Switch to using the interned serialization format. --- .../src/main/scala/sbt/compiler/AggressiveCompile.scala | 3 ++- .../src/main/scala/sbt/compiler/IncrementalCompiler.scala | 3 ++- main/actions/src/main/scala/sbt/Sync.scala | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/compile/integration/src/main/scala/sbt/compiler/AggressiveCompile.scala b/compile/integration/src/main/scala/sbt/compiler/AggressiveCompile.scala index 2ff410e4d..b9f62b912 100644 --- a/compile/integration/src/main/scala/sbt/compiler/AggressiveCompile.scala +++ b/compile/integration/src/main/scala/sbt/compiler/AggressiveCompile.scala @@ -180,7 +180,8 @@ class AggressiveCompile(cacheFile: File) private[this] def explicitBootClasspath(options: Seq[String]): Seq[File] = options.dropWhile(_ != CompilerArguments.BootClasspathOption).drop(1).take(1).headOption.toList.flatMap(IO.parseClasspath) - import AnalysisFormats._ + val formats = new sbt.inc.InternedAnalysisFormats() + import formats._ val store = AggressiveCompile.staticCache(cacheFile, AnalysisStore.sync(AnalysisStore.cached(FileBasedStore(cacheFile)))) } object AggressiveCompile diff --git a/compile/integration/src/main/scala/sbt/compiler/IncrementalCompiler.scala b/compile/integration/src/main/scala/sbt/compiler/IncrementalCompiler.scala index daad493f1..fddb04f09 100644 --- a/compile/integration/src/main/scala/sbt/compiler/IncrementalCompiler.scala +++ b/compile/integration/src/main/scala/sbt/compiler/IncrementalCompiler.scala @@ -42,7 +42,8 @@ object IC extends IncrementalCompiler[Analysis, AnalyzingCompiler] def readCacheUncaught(file: File): (Analysis, CompileSetup) = { import sbinary.DefaultProtocol.{immutableMapFormat, immutableSetFormat, StringFormat, tuple2Format} - import sbt.inc.AnalysisFormats._ + val formats = new sbt.inc.InternedAnalysisFormats() + import formats._ sbt.IO.gzipFileIn(file)( in => sbinary.Operations.read[(Analysis, CompileSetup)](in) ) } } diff --git a/main/actions/src/main/scala/sbt/Sync.scala b/main/actions/src/main/scala/sbt/Sync.scala index 6c64d9b66..2851e2414 100644 --- a/main/actions/src/main/scala/sbt/Sync.scala +++ b/main/actions/src/main/scala/sbt/Sync.scala @@ -71,7 +71,8 @@ object Sync import sbinary._ import Operations.{read, write} import DefaultProtocol.{FileFormat => _, _} - import inc.AnalysisFormats._ + val formats = new sbt.inc.InternedAnalysisFormats() + import formats._ def writeInfo[F <: FileInfo](file: File, relation: Relation[File, File], info: Map[File, F])(implicit infoFormat: Format[F]): Unit = IO.gzipFileOut(file) { out =>