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

Use sub-project names rather than their coordinates

This commit is contained in:
Alexandre Archambault 2016-08-22 00:19:52 +02:00
parent c17cf67734
commit 8ef5a4b46d
No known key found for this signature in database
GPG Key ID: 14640A6839C263A9
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
plugin/src/main/scala-2.10/coursier/Tasks.scala
View File

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