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

Move log to outer task

This commit is contained in:
Eugene Yokota 2019-04-19 14:06:06 -04:00
parent 697b2b534a
commit 5614cfcbb6
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
main/src/main/scala/sbt/internal/LMCoursier.scala
View File

@ -62,6 +62,8 @@ private[sbt] object LMCoursier {
sbtClassifiers: Boolean sbtClassifiers: Boolean
): Def.Initialize[Task[CoursierConfiguration]] = ): Def.Initialize[Task[CoursierConfiguration]] =
Def.taskDyn { Def.taskDyn {
val s = streams.value
val log = s.log
val resolversTask = val resolversTask =
if (sbtClassifiers) if (sbtClassifiers)
csrSbtResolvers csrSbtResolvers
@ -99,8 +101,7 @@ private[sbt] object LMCoursier {
val sbtScalaVersion = internalSbtScalaProvider.version() val sbtScalaVersion = internalSbtScalaProvider.version()
val sbtScalaOrganization = "org.scala-lang" // always assuming sbt uses mainline scala val sbtScalaOrganization = "org.scala-lang" // always assuming sbt uses mainline scala
val classifiers = classifiersTask.value val classifiers = classifiersTask.value
val s = streams.value Classpaths.warnResolversConflict(rs, log)
Classpaths.warnResolversConflict(rs, s.log)
CoursierConfiguration() CoursierConfiguration()
.withResolvers(rs.toVector) .withResolvers(rs.toVector)
.withInterProjectDependencies(interProjectDependencies.toVector) .withInterProjectDependencies(interProjectDependencies.toVector)
@ -124,7 +125,7 @@ private[sbt] object LMCoursier {
.withCredentials(credentials) .withCredentials(credentials)
.withLogger(createLogger) .withLogger(createLogger)
.withCache(cache) .withCache(cache)
.withLog(s.log) .withLog(log)
} }
} }