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

cleanup of #585: compatible with earlier launchers

This commit is contained in:
Mark Harrah 2012-10-29 09:52:10 -04:00
parent 835ee0d1b3
commit e532d20732
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ivy/IvyInterface.scala
View File

@ -89,7 +89,7 @@ final class Patterns(val ivyPatterns: Seq[String], val artifactPatterns: Seq[Str
case _ => false case _ => false
} }
} }
override def hashCode: Int = 617 * ivyPatterns.## + 37 * artifactPatterns.## + isMavenCompatible.hashCode override def hashCode: Int = (ivyPatterns, artifactPatterns, isMavenCompatible).hashCode
} }
object Patterns object Patterns
{ {

7
main/Defaults.scala
View File

@ -1211,13 +1211,18 @@ object Classpaths
def bootRepositories(app: xsbti.AppConfiguration): Option[Seq[Resolver]] = def bootRepositories(app: xsbti.AppConfiguration): Option[Seq[Resolver]] =
try { Some(app.provider.scalaProvider.launcher.ivyRepositories.toSeq map bootRepository) } try { Some(app.provider.scalaProvider.launcher.ivyRepositories.toSeq map bootRepository) }
catch { case _: NoSuchMethodError => None } catch { case _: NoSuchMethodError => None }
private[this] def mavenCompatible(ivyRepo: xsbti.IvyRepository): Boolean =
try { ivyRepo.mavenCompatible }
catch { case _: NoSuchMethodError => false }
private[this] def bootRepository(repo: xsbti.Repository): Resolver = private[this] def bootRepository(repo: xsbti.Repository): Resolver =
{ {
import xsbti.Predefined import xsbti.Predefined
repo match repo match
{ {
case m: xsbti.MavenRepository => MavenRepository(m.id, m.url.toString) case m: xsbti.MavenRepository => MavenRepository(m.id, m.url.toString)
case i: xsbti.IvyRepository => Resolver.url(i.id, i.url)(Patterns(i.ivyPattern :: Nil, i.artifactPattern :: Nil, i.mavenCompatible)) case i: xsbti.IvyRepository => Resolver.url(i.id, i.url)(Patterns(i.ivyPattern :: Nil, i.artifactPattern :: Nil, mavenCompatible(i)))
case p: xsbti.PredefinedRepository => p.id match { case p: xsbti.PredefinedRepository => p.id match {
case Predefined.Local => Resolver.defaultLocal case Predefined.Local => Resolver.defaultLocal
case Predefined.MavenLocal => Resolver.mavenLocal case Predefined.MavenLocal => Resolver.mavenLocal