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

Synchronize with changes to Zinc logger API 

https://github.com/sbt/zinc/pull/325
This commit is contained in:
jvican 2017-07-14 14:32:53 +02:00
parent 9429b76d67
commit 0cc3cfb364
No known key found for this signature in database
GPG Key ID: 42DAFA0F112E8050
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
main/src/main/scala/sbt/Defaults.scala
View File

@ -101,7 +101,7 @@ import sbt.internal.inc.{
Analysis, Analysis,
FileValueCache, FileValueCache,
Locate, Locate,
LoggerReporter, ManagedLoggedReporter,
MixedAnalyzingCompiler, MixedAnalyzingCompiler,
ScalaInstance ScalaInstance
} }
@ -1435,9 +1435,13 @@ object Defaults extends BuildCommon {
f1(foldMappers(sourcePositionMappers.value)), f1(foldMappers(sourcePositionMappers.value)),
compileOrder.value compileOrder.value
), ),
compilerReporter := new LoggerReporter(maxErrors.value, compilerReporter := {
new ManagedLoggedReporter(
maxErrors.value,
streams.value.log, streams.value.log,
foldMappers(sourcePositionMappers.value)), foldMappers(sourcePositionMappers.value)
)
},
compileInputs := new Inputs( compileInputs := new Inputs(
compilers.value, compilers.value,
compileOptions.value, compileOptions.value,
@ -1477,10 +1481,8 @@ object Defaults extends BuildCommon {
val problems = val problems =
analysis.infos.allInfos.values.flatMap(i => analysis.infos.allInfos.values.flatMap(i =>
i.getReportedProblems ++ i.getUnreportedProblems) i.getReportedProblems ++ i.getUnreportedProblems)
val reporter = new LoggerReporter(max, streams.value.log, foldMappers(spms)) val reporter = new ManagedLoggedReporter(max, streams.value.log, foldMappers(spms))
problems foreach { p => problems.foreach(p => reporter.log(p))
reporter.display(p)
}
} }
def sbtPluginExtra(m: ModuleID, sbtV: String, scalaV: String): ModuleID = def sbtPluginExtra(m: ModuleID, sbtV: String, scalaV: String): ModuleID =