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

Merge pull request #880 from teozkr/feature/sbt-pluggable-logger 

* Made coursierLoggerFactory a Task rather than a Setting

* s/coursierLoggerFactory/coursierCreateLogger/g
This commit is contained in:
Alexandre Archambault 2018-07-10 10:20:22 +02:00 committed by GitHub
parent 0b187efd96 c0558cb440
commit 76cd22b3e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sbt-coursier/src/main/scala/coursier/CoursierPlugin.scala
View File

@ -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)) ++

2
sbt-coursier/src/main/scala/coursier/Keys.scala
View File

@ -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 = SettingKey[() => Cache.Logger]("coursier-logger-factory")
val coursierCreateLogger = TaskKey[() => Cache.Logger]("coursier-create-logger")
val coursierVerbosity = SettingKey[Int]("coursier-verbosity")

4
sbt-coursier/src/main/scala/coursier/Tasks.scala
View File

@ -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

2
sbt-coursier/src/sbt-test/sbt-coursier/logger/build.sbt
View File

@ -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)