diff --git a/internal/zinc-persist/src/main/scala/sbt/internal/inc/consistent/ConsistentFileAnalysisStore.scala b/internal/zinc-persist/src/main/scala/sbt/internal/inc/consistent/ConsistentFileAnalysisStore.scala index 5cb69fcab..418eae932 100644 --- a/internal/zinc-persist/src/main/scala/sbt/internal/inc/consistent/ConsistentFileAnalysisStore.scala +++ b/internal/zinc-persist/src/main/scala/sbt/internal/inc/consistent/ConsistentFileAnalysisStore.scala @@ -12,29 +12,25 @@ package sbt.internal.inc.consistent * additional information regarding copyright ownership. */ -import java.io.{ File, FileInputStream, FileOutputStream } -import java.util.Optional import sbt.io.{ IO, Using } +import xsbti.compile.analysis.ReadWriteMappers import xsbti.compile.{ AnalysisContents, AnalysisStore => XAnalysisStore } +import java.io.{ File, FileInputStream, FileOutputStream } +import java.util.Optional import scala.util.control.Exception.allCatch -import xsbti.compile.analysis.ReadWriteMappers - -import scala.concurrent.ExecutionContext object ConsistentFileAnalysisStore { def text( file: File, mappers: ReadWriteMappers, sort: Boolean = true, - ec: ExecutionContext = ExecutionContext.global, parallelism: Int = Runtime.getRuntime.availableProcessors() ): XAnalysisStore = new AStore( file, new ConsistentAnalysisFormat(mappers, sort), SerializerFactory.text, - ec, parallelism ) @@ -59,14 +55,12 @@ object ConsistentFileAnalysisStore { file: File, mappers: ReadWriteMappers, sort: Boolean, - ec: ExecutionContext = ExecutionContext.global, parallelism: Int = Runtime.getRuntime.availableProcessors() ): XAnalysisStore = new AStore( file, new ConsistentAnalysisFormat(mappers, sort), SerializerFactory.binary, - ec, parallelism ) @@ -74,7 +68,6 @@ object ConsistentFileAnalysisStore { file: File, format: ConsistentAnalysisFormat, sf: SerializerFactory[S, D], - ec: ExecutionContext = ExecutionContext.global, parallelism: Int = Runtime.getRuntime.availableProcessors() ) extends XAnalysisStore { @@ -85,7 +78,7 @@ object ConsistentFileAnalysisStore { if (!file.getParentFile.exists()) file.getParentFile.mkdirs() val fout = new FileOutputStream(tmpAnalysisFile) try { - val gout = new ParallelGzipOutputStream(fout, ec, parallelism) + val gout = new ParallelGzipOutputStream(fout, parallelism) val ser = sf.serializerFor(gout) format.write(ser, analysis, setup) gout.close() diff --git a/zinc/src/main/scala/sbt/internal/inc/MixedAnalyzingCompiler.scala b/zinc/src/main/scala/sbt/internal/inc/MixedAnalyzingCompiler.scala index 81ed0f88f..e228ab573 100644 --- a/zinc/src/main/scala/sbt/internal/inc/MixedAnalyzingCompiler.scala +++ b/zinc/src/main/scala/sbt/internal/inc/MixedAnalyzingCompiler.scala @@ -507,7 +507,6 @@ object MixedAnalyzingCompiler { useConsistent = false, mappers = ReadWriteMappers.getEmptyMappers(), sort = true, - ec = ExecutionContext.global, parallelism = Runtime.getRuntime.availableProcessors(), ) @@ -517,7 +516,6 @@ object MixedAnalyzingCompiler { useConsistent: Boolean, mappers: ReadWriteMappers, sort: Boolean, - ec: ExecutionContext, parallelism: Int, ): AnalysisStore = { val fileStore = (useTextAnalysis, useConsistent) match { @@ -528,7 +526,6 @@ object MixedAnalyzingCompiler { file = analysisFile.toFile, mappers = mappers, sort = sort, - ec = ec, parallelism = parallelism, ) case (true, false) => @@ -538,7 +535,6 @@ object MixedAnalyzingCompiler { file = analysisFile.toFile, mappers = mappers, sort = sort, - ec = ec, parallelism = parallelism, ) }