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

Merge pull request #1621 from tmandke/0.13 

propagate pattern descriptorOptional and skipConsistencyCheck
This commit is contained in:
Josh Suereth 2014-09-26 07:22:47 -04:00
parent 64b17a348c 51f48a8993
commit e96d40ebbd
2 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ivy/src/main/scala/sbt/Resolver.scala
View File

@ -285,7 +285,7 @@ object Resolver {
private def resolvePatterns(base: String, basePatterns: Patterns): Patterns =
{
def resolveAll(patterns: Seq[String]) = patterns.map(p => resolvePattern(base, p))
Patterns(resolveAll(basePatterns.ivyPatterns), resolveAll(basePatterns.artifactPatterns), basePatterns.isMavenCompatible)
Patterns(resolveAll(basePatterns.ivyPatterns), resolveAll(basePatterns.artifactPatterns), basePatterns.isMavenCompatible, basePatterns.descriptorOptional, basePatterns.skipConsistencyCheck)
}
private[sbt] def resolvePattern(base: String, pattern: String): String =
{

24
ivy/src/test/scala/ResolverTest.scala Normal file
View File

@ -0,0 +1,24 @@
import java.net.URL
import org.specs2.mutable.Specification
import sbt._
object ResolverTest extends Specification {
"Resolver" should {
"url" should {
"propagate pattern descriptorOptional and skipConsistencyCheck." in {
val pats = Seq("[orgPath]")
val patsExpected = Seq("http://foo.com/test/[orgPath]")
val patterns = Resolver.url("test", new URL("http://foo.com/test"))(Patterns(pats, pats, isMavenCompatible = false, descriptorOptional = true, skipConsistencyCheck = true)).patterns
patterns.ivyPatterns must equalTo(patsExpected)
patterns.artifactPatterns must equalTo(patsExpected)
patterns.isMavenCompatible must beFalse
patterns.skipConsistencyCheck must beTrue
patterns.descriptorOptional must beTrue
}
}
}
}