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

add checks to Artifact.extra

This commit is contained in:
Mark Harrah 2010-04-23 18:50:47 -04:00
parent 291e2dc17e
commit 7340febe05
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ivy/IvyInterface.scala
View File

@ -323,7 +323,7 @@ final case class Configuration(name: String, description: String, isPublic: Bool
final case class Artifact(name: String, `type`: String, extension: String, classifier: Option[String], configurations: Iterable[Configuration], url: Option[URL], extraAttributes: Map[String,String]) extends NotNull final case class Artifact(name: String, `type`: String, extension: String, classifier: Option[String], configurations: Iterable[Configuration], url: Option[URL], extraAttributes: Map[String,String]) extends NotNull
{ {
def extra(attributes: (String,String)*) = Artifact(name, `type`, extension, classifier, configurations, url, extraAttributes ++ attributes) def extra(attributes: (String,String)*) = Artifact(name, `type`, extension, classifier, configurations, url, extraAttributes ++ ModuleID.checkE(attributes))
} }
object Artifact object Artifact
{ {

2
ivy/IvyScala.scala
View File

@ -47,7 +47,7 @@ private object IvyScala
private def configurationSet(configurations: Iterable[Configuration]) = HashSet(configurations.map(_.toString).toSeq : _*) private def configurationSet(configurations: Iterable[Configuration]) = HashSet(configurations.map(_.toString).toSeq : _*)
/** Adds exclusions for the scala library and compiler jars so that they are not downloaded. This is /** Adds exclusions for the scala library and compiler jars so that they are not downloaded. This is
* done because normally these jars are already on the classpath and cannot/should not be overridden. The version * done because normally these jars are already on the classpath and cannot/should not be overridden. The version
* of Scala to use is done by setting scala.version in the project definition. */ * of Scala to use is done by setting build.scala.versions in the project definition. */
private def excludeScalaJars(module: DefaultModuleDescriptor, configurations: Iterable[Configuration]) private def excludeScalaJars(module: DefaultModuleDescriptor, configurations: Iterable[Configuration])
{ {
val configurationNames = val configurationNames =