diff --git a/ivy/ConvertResolver.scala b/ivy/ConvertResolver.scala index 7901eb744..50e511e3d 100644 --- a/ivy/ConvertResolver.scala +++ b/ivy/ConvertResolver.scala @@ -60,6 +60,7 @@ private object ConvertResolver initializePatterns(resolver, repo.patterns) resolver } + case repo: RawRepository => repo.resolver } } private def initializeMavenStyle(resolver: IBiblioResolver, name: String, root: String) diff --git a/ivy/IvyInterface.scala b/ivy/IvyInterface.scala index cbbede0ca..2e4038074 100644 --- a/ivy/IvyInterface.scala +++ b/ivy/IvyInterface.scala @@ -6,7 +6,7 @@ package sbt import java.io.File import java.net.{URI, URL} import scala.xml.NodeSeq -import org.apache.ivy.plugins.resolver.IBiblioResolver +import org.apache.ivy.plugins.resolver.{DependencyResolver, IBiblioResolver} import org.apache.ivy.util.url.CredentialsStore final case class ModuleID(organization: String, name: String, revision: String, configurations: Option[String], isChanging: Boolean, isTransitive: Boolean, explicitArtifacts: Seq[Artifact], extraAttributes: Map[String,String]) extends NotNull @@ -45,6 +45,10 @@ sealed trait Resolver extends NotNull { def name: String } +final class RawRepository(val resolver: DependencyResolver) extends Resolver +{ + def name = resolver.getName +} sealed case class MavenRepository(name: String, root: String) extends Resolver { override def toString = name + ": " + root