From 776bcb893f00caa2cb5a406d30710eec57c934f4 Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Wed, 30 Dec 2015 01:34:42 +0100 Subject: [PATCH] Add classifier variable in Ivy patterns --- .../src/main/scala/coursier/ivy/IvyRepository.scala | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/core/shared/src/main/scala/coursier/ivy/IvyRepository.scala b/core/shared/src/main/scala/coursier/ivy/IvyRepository.scala index 04582ee6e..fb14f9738 100644 --- a/core/shared/src/main/scala/coursier/ivy/IvyRepository.scala +++ b/core/shared/src/main/scala/coursier/ivy/IvyRepository.scala @@ -151,7 +151,8 @@ case class IvyRepository( version: String, `type`: String, artifact: String, - ext: String + ext: String, + classifierOpt: Option[String] ) = Map( "organization" -> module.organization, @@ -162,7 +163,7 @@ case class IvyRepository( "type" -> `type`, "artifact" -> artifact, "ext" -> ext - ) ++ module.attributes + ) ++ module.attributes ++ classifierOpt.map("classifier" -> _).toSeq val source: Artifact.Source = @@ -198,7 +199,8 @@ case class IvyRepository( dependency.version, p.`type`, p.name, - p.ext + p.ext, + Some(p.classifier).filter(_.nonEmpty) )).toList.map(p -> _) } @@ -235,7 +237,7 @@ case class IvyRepository( val eitherArtifact: String \/ Artifact = for { url <- substitute( - variables(module, version, "ivy", "ivy", "xml") + variables(module, version, "ivy", "ivy", "xml", None) ) } yield { var artifact = Artifact(