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

Merge pull request #3072 from eed3si9n/fport/2993 

[fport] Add local-preloaded repo
This commit is contained in:
eugene yokota 2017-04-04 19:43:20 -07:00 committed by GitHub
parent 43d0013bf7 9dac6e910d
commit f0a16b927a
4 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.travis.yml
View File

@ -23,8 +23,10 @@ env:
- SBT_CMD="scripted actions/*"
- SBT_CMD="scripted apiinfo/*"
- SBT_CMD="scripted compiler-project/*"
- SBT_CMD="scripted dependency-management/*1of2"
- SBT_CMD="scripted dependency-management/*2of2"
- SBT_CMD="scripted dependency-management/*1of4"
- SBT_CMD="scripted dependency-management/*2of4"
- SBT_CMD="scripted dependency-management/*3of4"
- SBT_CMD="scripted dependency-management/*4of4"
- SBT_CMD="scripted ivy-deps-management/*"
- SBT_CMD="scripted java/*"
- SBT_CMD="scripted package/*"

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

@ -12,6 +12,8 @@
[repositories]
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
sbt-maven-releases: https://repo.scala-sbt.org/scalasbt/maven-releases/, 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 writtenRepositories = repositories.map(read).distinct
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;
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
def pomIncludeRepository(base: File, prev: MavenRepository => Boolean) = (r: MavenRepository) =>
if(base / "repo.none" exists) false else if(base / "repo.all" exists) true else prev(r)
def pomIncludeRepository(base: File, prev: MavenRepository => Boolean): MavenRepository => Boolean =
{
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 =
s match {