From 5614cfcbb6e9379bcab9815d97deb424642d0f81 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Fri, 19 Apr 2019 14:06:06 -0400 Subject: [PATCH] Move log to outer task --- main/src/main/scala/sbt/internal/LMCoursier.scala | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/main/src/main/scala/sbt/internal/LMCoursier.scala b/main/src/main/scala/sbt/internal/LMCoursier.scala index f39198ee2..57c3505b4 100644 --- a/main/src/main/scala/sbt/internal/LMCoursier.scala +++ b/main/src/main/scala/sbt/internal/LMCoursier.scala @@ -62,6 +62,8 @@ private[sbt] object LMCoursier { sbtClassifiers: Boolean ): Def.Initialize[Task[CoursierConfiguration]] = Def.taskDyn { + val s = streams.value + val log = s.log val resolversTask = if (sbtClassifiers) csrSbtResolvers @@ -99,8 +101,7 @@ private[sbt] object LMCoursier { val sbtScalaVersion = internalSbtScalaProvider.version() val sbtScalaOrganization = "org.scala-lang" // always assuming sbt uses mainline scala val classifiers = classifiersTask.value - val s = streams.value - Classpaths.warnResolversConflict(rs, s.log) + Classpaths.warnResolversConflict(rs, log) CoursierConfiguration() .withResolvers(rs.toVector) .withInterProjectDependencies(interProjectDependencies.toVector) @@ -124,7 +125,7 @@ private[sbt] object LMCoursier { .withCredentials(credentials) .withLogger(createLogger) .withCache(cache) - .withLog(s.log) + .withLog(log) } }