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

manually expand ivy.home 

Ref coursier/coursier#1124
This commit is contained in:
Eugene Yokota 2019-04-26 17:51:17 -04:00
parent f354a626c7
commit 8c0f13a24a
1 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
main/src/main/scala/sbt/internal/librarymanagement/CoursierRepositoriesTasks.scala
View File

@ -12,6 +12,7 @@ package librarymanagement
import sbt.librarymanagement._ import sbt.librarymanagement._
import sbt.Keys._ import sbt.Keys._
import sbt.ScopeFilter.Make._ import sbt.ScopeFilter.Make._
import sbt.io.IO
private[sbt] object CoursierRepositoriesTasks { private[sbt] object CoursierRepositoriesTasks {
private object CResolvers { private object CResolvers {
@ -80,20 +81,38 @@ private[sbt] object CoursierRepositoriesTasks {
val overrideFlag = overrideBuildResolvers.value val overrideFlag = overrideBuildResolvers.value
Def.task { Def.task {
val result = resultTask(bootResOpt, overrideFlag).value val result0 = resultTask(bootResOpt, overrideFlag).value
val reorderResolvers = true // coursierReorderResolvers.value val reorderResolvers = true // coursierReorderResolvers.value
val keepPreloaded = true // coursierKeepPreloaded.value val keepPreloaded = true // coursierKeepPreloaded.value
val result0 = val paths = ivyPaths.value
if (reorderResolvers) val result1 =
CResolvers.reorderResolvers(result) if (reorderResolvers) CResolvers.reorderResolvers(result0)
else else result0
result val result2 =
paths.ivyHome match {
case Some(ivyHome) =>
val ivyHomeUri = IO.toURI(ivyHome).getSchemeSpecificPart
result1 map {
case r: FileRepository =>
val ivyPatterns = r.patterns.ivyPatterns map {
_.replaceAllLiterally("$" + "{ivy.home}", ivyHomeUri)
}
val artifactPatterns = r.patterns.artifactPatterns map {
_.replaceAllLiterally("$" + "{ivy.home}", ivyHomeUri)
}
val p =
r.patterns.withIvyPatterns(ivyPatterns).withArtifactPatterns(artifactPatterns)
r.withPatterns(p)
case r => r
}
case _ => result1
}
if (keepPreloaded) if (keepPreloaded)
result0 result2
else else
result0.filter { r => result2.filter { r =>
!r.name.startsWith("local-preloaded") !r.name.startsWith("local-preloaded")
} }
} }