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

Fix warning with Scala 2.11 

We get a warning about the exhaustivity check, but the warning
disappears if we increase the maximum recursion depth.
This commit is contained in:
Martin Duhem 2016-04-27 10:33:02 +02:00
parent 65adc869d4
commit ed0f2af66b
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
librarymanagement/src/main/scala/sbt/internal/librarymanagement/RepositoriesParser.scala
View File

@ -50,10 +50,14 @@ private[sbt] object RepositoriesParser {
name ~ ": " ~ basicUri ~ (separator ~> ivyPattern).? ~ (separator ~> afterPattern).? map {
case name ~ ": " ~ uri ~ None ~ _ =>
new MavenRepository(name, uri.toURL)
case name ~ ": " ~ uri ~ Some(ivy) ~ None =>
new IvyRepository(name, uri.toURL, ivy, ivy, false, false, false, false)
case name ~ ": " ~ uri ~ Some(ivy) ~ Some(AfterPattern(artifactPattern, Flags(dOpt, sc, bo, mc))) =>
new IvyRepository(name, uri.toURL, ivy, artifactPattern getOrElse ivy, mc, sc, dOpt, bo)
case name ~ ": " ~ uri ~ Some(ivy) ~ ap =>
// scalac complains about the recursion depth if we pattern match over `ap` directly.
ap match {
case Some(AfterPattern(artifactPattern, Flags(dOpt, sc, bo, mc))) =>
new IvyRepository(name, uri.toURL, ivy, artifactPattern getOrElse ivy, mc, sc, dOpt, bo)
case None =>
new IvyRepository(name, uri.toURL, ivy, ivy, false, false, false, false)
}
}
def resolver: Parser[xsbti.Repository] =