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

Untested PR for #485. Unable to test because unable to build

This commit is contained in:
Brian Topping 2014-09-15 10:48:47 -04:00
parent 4d6de77374
commit cf48063f2f
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,7 +5,7 @@ package sbt
import java.io.File import java.io.File
import java.net.URL import java.net.URL
import scala.xml.NodeSeq import scala.xml.{ XML, NodeSeq }
import org.apache.ivy.plugins.resolver.DependencyResolver import org.apache.ivy.plugins.resolver.DependencyResolver
sealed trait Resolver { sealed trait Resolver {
@ -300,8 +300,19 @@ object Resolver {
def localBasePattern = "[organisation]/[module]/" + PluginPattern + "[revision]/[type]s/[artifact](-[classifier]).[ext]" def localBasePattern = "[organisation]/[module]/" + PluginPattern + "[revision]/[type]s/[artifact](-[classifier]).[ext]"
def defaultRetrievePattern = "[type]s/[organisation]/[module]/" + PluginPattern + "[artifact](-[revision])(-[classifier]).[ext]" def defaultRetrievePattern = "[type]s/[organisation]/[module]/" + PluginPattern + "[artifact](-[revision])(-[classifier]).[ext]"
final val PluginPattern = "(scala_[scalaVersion]/)(sbt_[sbtVersion]/)" final val PluginPattern = "(scala_[scalaVersion]/)(sbt_[sbtVersion]/)"
private[this] def mavenLocalDir: File =
private[this] def mavenLocalDir = new File(Path.userHome, ".m2/repository/") {
val homeConfig = XML.loadFile(new File(Path.userHome, ".m2/settings.xml"))
homeConfig \ "settings" \ "localRepository" match {
case scala.xml.Text(x) => new File(x)
case _ =>
val globalConfig = XML.loadFile(new File(Path.fileProperty("M2_HOME"), "conf/settings.xml"))
globalConfig \ "settings" \ "localRepository" match {
case scala.xml.Text(x) => new File(x)
case _ => new File(Path.userHome, ".m2/repository/")
}
}
}
def publishMavenLocal = Resolver.file("publish-m2-local", mavenLocalDir) def publishMavenLocal = Resolver.file("publish-m2-local", mavenLocalDir)
def mavenLocal = MavenRepository("Maven2 Local", mavenLocalDir.toURI.toString) def mavenLocal = MavenRepository("Maven2 Local", mavenLocalDir.toURI.toString)
def defaultLocal = defaultUserFileRepository("local") def defaultLocal = defaultUserFileRepository("local")