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

Use fallback logger in in CI and all (#52)

This commit is contained in:
Alexandre Archambault 2019-03-22 18:53:09 +01:00 committed by GitHub
parent 49b1674211
commit 8f3401788e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
modules/lm-coursier/src/main/scala/coursier/lmcoursier/ArtifactsRun.scala
View File

@ -3,7 +3,7 @@ package coursier.lmcoursier
import java.io.File
import coursier.Artifact
import coursier.cache.loggers.{ProgressBarRefreshDisplay, RefreshLogger}
import coursier.cache.loggers.{FallbackRefreshDisplay, ProgressBarRefreshDisplay, RefreshLogger}
import coursier.core.Type
import coursier.util.Sync
import sbt.util.Logger
@ -52,14 +52,17 @@ object ArtifactsRun {
.withLogger(
params.loggerOpt.getOrElse {
RefreshLogger.create(
ProgressBarRefreshDisplay.create(
if (printOptionalMessage) log.info(artifactInitialMessage),
if (printOptionalMessage || verbosityLevel >= 2)
log.info(
s"Fetched artifacts of ${params.projectName}" +
(if (params.sbtClassifiers) " (sbt classifiers)" else "")
)
)
if (RefreshLogger.defaultFallbackMode)
new FallbackRefreshDisplay()
else
ProgressBarRefreshDisplay.create(
if (printOptionalMessage) log.info(artifactInitialMessage),
if (printOptionalMessage || verbosityLevel >= 2)
log.info(
s"Fetched artifacts of ${params.projectName}" +
(if (params.sbtClassifiers) " (sbt classifiers)" else "")
)
)
)
}
)

15
modules/lm-coursier/src/main/scala/coursier/lmcoursier/ResolutionRun.scala
View File

@ -1,7 +1,7 @@
package coursier.lmcoursier
import coursier.{Resolution, Resolve}
import coursier.cache.loggers.{ProgressBarRefreshDisplay, RefreshLogger}
import coursier.cache.loggers.{FallbackRefreshDisplay, ProgressBarRefreshDisplay, RefreshLogger}
import coursier.core._
import coursier.ivy.IvyRepository
import coursier.maven.MavenRepository
@ -88,11 +88,14 @@ object ResolutionRun {
.withLogger(
params.loggerOpt.getOrElse {
RefreshLogger.create(
ProgressBarRefreshDisplay.create(
if (printOptionalMessage) log.info(initialMessage),
if (printOptionalMessage || verbosityLevel >= 2)
log.info(s"Resolved ${params.projectName} dependencies")
)
if (RefreshLogger.defaultFallbackMode)
new FallbackRefreshDisplay()
else
ProgressBarRefreshDisplay.create(
if (printOptionalMessage) log.info(initialMessage),
if (printOptionalMessage || verbosityLevel >= 2)
log.info(s"Resolved ${params.projectName} dependencies")
)
)
}
)