From 8f3401788efdbdc71f9ab1f8f6028e0ba08f87d9 Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Fri, 22 Mar 2019 18:53:09 +0100 Subject: [PATCH] Use fallback logger in in CI and all (#52) --- .../coursier/lmcoursier/ArtifactsRun.scala | 21 +++++++++++-------- .../coursier/lmcoursier/ResolutionRun.scala | 15 +++++++------ 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/modules/lm-coursier/src/main/scala/coursier/lmcoursier/ArtifactsRun.scala b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/ArtifactsRun.scala index cde778a8a..18ceebfc9 100644 --- a/modules/lm-coursier/src/main/scala/coursier/lmcoursier/ArtifactsRun.scala +++ b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/ArtifactsRun.scala @@ -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 "") + ) + ) ) } ) diff --git a/modules/lm-coursier/src/main/scala/coursier/lmcoursier/ResolutionRun.scala b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/ResolutionRun.scala index 2eccddd64..15bbc7d9a 100644 --- a/modules/lm-coursier/src/main/scala/coursier/lmcoursier/ResolutionRun.scala +++ b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/ResolutionRun.scala @@ -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") + ) ) } )