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

Merge pull request #6456 from guilgaly/coursier-ivy-dependency-classifier 

Retain classifiers for transitive dependencies when publishing to Ivy using Coursier
This commit is contained in:
eugene yokota 2021-04-19 10:13:17 -04:00 committed by GitHub
parent 07f3da25ce 8849bfbcd5
commit 943677ed9a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
main/src/main/scala/sbt/internal/librarymanagement/IvyXml.scala
View File

@ -152,6 +152,18 @@ object IvyXml {
val dependencyElems = project.dependencies.toVector.map { val dependencyElems = project.dependencies.toVector.map {
case (conf, dep) => case (conf, dep) =>
val classifier = {
val pub = dep.publication
if (pub.classifier.value.nonEmpty)
Seq(
<artifact name={pub.name} type={pub.`type`.value} ext={pub.ext.value} conf="*" e:classifier={
pub.classifier.value
} />
)
else
Seq.empty
}
val excludes = dep.exclusions.toSeq.map { val excludes = dep.exclusions.toSeq.map {
case (org, name) => case (org, name) =>
<exclude org={org.value} module={name.value} name="*" type="*" ext="*" conf="" matcher="exact"/> <exclude org={org.value} module={name.value} name="*" type="*" ext="*" conf="" matcher="exact"/>
@ -161,6 +173,7 @@ object IvyXml {
<dependency org={dep.module.organization.value} name={dep.module.name.value} rev={ <dependency org={dep.module.organization.value} name={dep.module.name.value} rev={
dep.version dep.version
} conf={s"${conf.value}->${dep.configuration.value}"}> } conf={s"${conf.value}->${dep.configuration.value}"}>
{classifier}
{excludes} {excludes}
</dependency> </dependency>