diff --git a/sbt-coursier/src/main/scala/coursier/CoursierPlugin.scala b/sbt-coursier/src/main/scala/coursier/CoursierPlugin.scala index 6527aabde..a5dc13dfc 100644 --- a/sbt-coursier/src/main/scala/coursier/CoursierPlugin.scala +++ b/sbt-coursier/src/main/scala/coursier/CoursierPlugin.scala @@ -53,7 +53,7 @@ object CoursierPlugin extends AutoPlugin { val coursierClassifiersArtifacts = Keys.coursierClassifiersArtifacts val coursierSbtClassifiersArtifacts = Keys.coursierSbtClassifiersArtifacts - val coursierLoggerFactory = Keys.coursierLoggerFactory + val coursierCreateLogger = Keys.coursierCreateLogger val coursierVersion = coursier.util.Properties.version val addSbtCoursier = { @@ -310,7 +310,7 @@ object CoursierPlugin extends AutoPlugin { coursierCache := Cache.default, coursierReorderResolvers := true, coursierKeepPreloaded := false, - coursierLoggerFactory := { () => new TermDisplay(new OutputStreamWriter(System.err)) } + coursierCreateLogger := { () => new TermDisplay(new OutputStreamWriter(System.err)) } ) override lazy val projectSettings = coursierSettings(None, Seq(Compile, Test).map(c => c -> c.name)) ++ diff --git a/sbt-coursier/src/main/scala/coursier/Keys.scala b/sbt-coursier/src/main/scala/coursier/Keys.scala index 79497d76c..f25029581 100644 --- a/sbt-coursier/src/main/scala/coursier/Keys.scala +++ b/sbt-coursier/src/main/scala/coursier/Keys.scala @@ -17,7 +17,7 @@ object Keys { val coursierCachePolicies = SettingKey[Seq[CachePolicy]]("coursier-cache-policies") val coursierTtl = SettingKey[Option[Duration]]("coursier-ttl") val coursierKeepPreloaded = SettingKey[Boolean]("coursier-keep-preloaded", "Whether to take into account sbt preloaded repositories or not") - val coursierLoggerFactory = TaskKey[() => Cache.Logger]("coursier-logger-factory") + val coursierCreateLogger = TaskKey[() => Cache.Logger]("coursier-create-logger") val coursierVerbosity = SettingKey[Int]("coursier-verbosity") diff --git a/sbt-coursier/src/main/scala/coursier/Tasks.scala b/sbt-coursier/src/main/scala/coursier/Tasks.scala index 5c874d935..19d191015 100644 --- a/sbt-coursier/src/main/scala/coursier/Tasks.scala +++ b/sbt-coursier/src/main/scala/coursier/Tasks.scala @@ -602,7 +602,7 @@ object Tasks { val cachePolicies = coursierCachePolicies.value val ttl = coursierTtl.value val cache = coursierCache.value - val createLogger = coursierLoggerFactory.value + val createLogger = coursierCreateLogger.value val log = streams.value.log @@ -959,7 +959,7 @@ object Tasks { val cachePolicies = coursierCachePolicies.value val ttl = coursierTtl.value val cache = coursierCache.value - val createLogger = coursierLoggerFactory.value + val createLogger = coursierCreateLogger.value val log = streams.value.log diff --git a/sbt-coursier/src/sbt-test/sbt-coursier/logger/build.sbt b/sbt-coursier/src/sbt-test/sbt-coursier/logger/build.sbt index bd0ba0011..1fc080996 100644 --- a/sbt-coursier/src/sbt-test/sbt-coursier/logger/build.sbt +++ b/sbt-coursier/src/sbt-test/sbt-coursier/logger/build.sbt @@ -6,7 +6,7 @@ libraryDependencies += "org.slf4j" % "slf4j-api" % "1.7.25" coursierCache := baseDirectory.value / "cache" logFile := baseDirectory.value / "log" -coursierLoggerFactory := { +coursierCreateLogger := { val logStream = new java.io.PrintStream(logFile.value) def log(msg: String): Unit = { println(msg)