diff --git a/plugin/src/main/scala-2.10/coursier/Tasks.scala b/plugin/src/main/scala-2.10/coursier/Tasks.scala index f700ced85..069b63726 100644 --- a/plugin/src/main/scala-2.10/coursier/Tasks.scala +++ b/plugin/src/main/scala-2.10/coursier/Tasks.scala @@ -276,9 +276,6 @@ object Tasks { Module(scalaOrganization, "scalap") -> scalaVersion ) - private def projectDescription(project: Project) = - s"${project.module.organization}:${project.module.name}:${project.version}" - private def createLogger() = new TermDisplay(new OutputStreamWriter(System.err)) private lazy val globalPluginPattern = { @@ -325,6 +322,8 @@ object Tasks { lazy val cm = coursierSbtClassifiersModule.value + lazy val projectName = thisProjectRef.value.project + val (currentProject, fallbackDependencies) = if (sbtClassifiers) { val sv = scalaVersion.value @@ -614,8 +613,7 @@ object Tasks { if (verbosityLevel >= 0) log.info( - s"Updating ${projectDescription(currentProject)}" + - (if (sbtClassifiers) " (sbt classifiers)" else "") + s"Updating $projectName" + (if (sbtClassifiers) " (sbt classifiers)" else "") ) if (verbosityLevel >= 2) for (depRepr <- depsRepr(currentProject.dependencies)) @@ -663,7 +661,7 @@ object Tasks { } if (verbosityLevel >= 0) - log.info(s"Resolved ${projectDescription(currentProject)} dependencies") + log.info(s"Resolved $projectName dependencies") res } finally { @@ -705,6 +703,8 @@ object Tasks { lazy val cm = coursierSbtClassifiersModule.value + lazy val projectName = thisProjectRef.value.project + val currentProject = if (sbtClassifiers) { val sv = scalaVersion.value @@ -834,7 +834,7 @@ object Tasks { if (verbosityLevel >= 0) log.info( - s"Fetching artifacts of ${projectDescription(currentProject)}" + + s"Fetching artifacts of $projectName" + (if (sbtClassifiers) " (sbt classifiers)" else "") ) @@ -850,7 +850,7 @@ object Tasks { if (verbosityLevel >= 0) log.info( - s"Fetched artifacts of ${projectDescription(currentProject)}" + + s"Fetched artifacts of $projectName" + (if (sbtClassifiers) " (sbt classifiers)" else "") ) @@ -925,6 +925,8 @@ object Tasks { ignoreArtifactErrors: Boolean = false ) = Def.task { + lazy val projectName = thisProjectRef.value.project + val currentProject = if (sbtClassifiers) { val cm = coursierSbtClassifiersModule.value @@ -968,7 +970,7 @@ object Tasks { // use sbt logging? println( - projectDescription(currentProject) + "\n" + + projectName + "\n" + Print.dependencyTree(dependencies0, subRes, printExclusions = true, inverse) ) }