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

Add local-preloaded repo

This commit is contained in:
Eugene Yokota 2017-03-04 12:55:13 -05:00
parent a2b0037f64
commit cac2d5ad7b
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
launch/src/main/input_resources/sbt/sbt.boot.properties
View File

@ -12,6 +12,8 @@
[repositories] [repositories]
local local
local-preloaded-ivy: file://${sbt.preloaded-${sbt.global.base-${user.home}/.sbt}/preloaded/}, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext]
local-preloaded: file://${sbt.preloaded-${sbt.global.base-${user.home}/.sbt}/preloaded/}
maven-central maven-central
sbt-maven-releases: https://repo.scala-sbt.org/scalasbt/maven-releases/, bootOnly sbt-maven-releases: https://repo.scala-sbt.org/scalasbt/maven-releases/, bootOnly
sbt-maven-snapshots: https://repo.scala-sbt.org/scalasbt/maven-snapshots/, bootOnly sbt-maven-snapshots: https://repo.scala-sbt.org/scalasbt/maven-snapshots/, bootOnly

2
sbt/src/sbt-test/dependency-management/make-pom/build.sbt
View File

@ -49,7 +49,7 @@ lazy val checkPom = (readPom, fullResolvers) map { (pomXML, ivyRepositories) =>
val repositories = repositoriesElement \ "repository" val repositories = repositoriesElement \ "repository"
val writtenRepositories = repositories.map(read).distinct val writtenRepositories = repositories.map(read).distinct
val mavenStyleRepositories = ivyRepositories.collect { val mavenStyleRepositories = ivyRepositories.collect {
case x: MavenRepository if (x.name != "public") && (x.name != "jcenter") => normalize(x) case x: MavenRepository if (x.name != "public") && (x.name != "jcenter") && !(x.root startsWith "file:") => normalize(x)
} distinct; } distinct;
lazy val explain = (("Written:" +: writtenRepositories) ++ ("Declared:" +: mavenStyleRepositories)).mkString("\n\t") lazy val explain = (("Written:" +: writtenRepositories) ++ ("Declared:" +: mavenStyleRepositories)).mkString("\n\t")

9
sbt/src/sbt-test/dependency-management/pom-advanced/build.sbt
View File

@ -12,8 +12,13 @@ lazy val root = (project in file(".")).
val local = "local-maven-repo" at "file://" + (Path.userHome / ".m2" /"repository").absolutePath val local = "local-maven-repo" at "file://" + (Path.userHome / ".m2" /"repository").absolutePath
def pomIncludeRepository(base: File, prev: MavenRepository => Boolean) = (r: MavenRepository) => def pomIncludeRepository(base: File, prev: MavenRepository => Boolean): MavenRepository => Boolean =
if(base / "repo.none" exists) false else if(base / "repo.all" exists) true else prev(r) {
case r: MavenRepository if (r.name == "local-preloaded") => false
case r: MavenRepository if (base / "repo.none" exists) => false
case r: MavenRepository if (base / "repo.all" exists) => true
case r: MavenRepository => prev(r)
}
def addSlash(s: String): String = def addSlash(s: String): String =
s match { s match {