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

Take into account sbt.global.base and sbt.ivy.home properties

This commit is contained in:
Alexandre Archambault 2016-08-15 16:14:27 +02:00
parent ad4ba45be4
commit 908a596b6d
No known key found for this signature in database
GPG Key ID: 14640A6839C263A9
1 changed files with 35 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
plugin/src/main/scala-2.10/coursier/Tasks.scala
View File

@ -6,7 +6,7 @@ import java.nio.file.Files
import java.util.concurrent.{ ExecutorService, Executors } import java.util.concurrent.{ ExecutorService, Executors }
import coursier.core.{ Authentication, Publication } import coursier.core.{ Authentication, Publication }
import coursier.ivy.IvyRepository import coursier.ivy.{ IvyRepository, PropertiesPattern }
import coursier.Keys._ import coursier.Keys._
import coursier.Structure._ import coursier.Structure._
import coursier.maven.WritePom import coursier.maven.WritePom
@ -258,6 +258,26 @@ object Tasks {
private def createLogger() = new TermDisplay(new OutputStreamWriter(System.err)) private def createLogger() = new TermDisplay(new OutputStreamWriter(System.err))
private lazy val globalPluginPattern = {
// FIXME get the 0.13 automatically?
val s = s"file:$${sbt.global.base-$${user.home}/.sbt/0.13}/plugins/target/resolution-cache/" +
"[organization]/[module](/scala_[scalaVersion])(/sbt_[sbtVersion])/[revision]/resolved.xml.[ext]"
val p = PropertiesPattern.parse(s) match {
case -\/(err) =>
throw new Exception(s"Cannot parse pattern $s: $err")
case \/-(p) =>
p
}
p.substituteProperties(sys.props.toMap) match {
case -\/(err) =>
throw new Exception(err)
case \/-(p) =>
p
}
}
def resolutionTask( def resolutionTask(
sbtClassifiers: Boolean = false sbtClassifiers: Boolean = false
) = Def.task { ) = Def.task {
@ -400,9 +420,8 @@ object Tasks {
log.info(s" ${p.module}:${p.version}") log.info(s" ${p.module}:${p.version}")
} }
val globalPluginsRepo = IvyRepository( val globalPluginsRepo = IvyRepository.fromPattern(
new File(sys.props("user.home") + "/.sbt/0.13/plugins/target/resolution-cache/").toURI.toString + globalPluginPattern,
"[organization]/[module](/scala_[scalaVersion])(/sbt_[sbtVersion])/[revision]/resolved.xml.[ext]",
withChecksums = false, withChecksums = false,
withSignatures = false, withSignatures = false,
withArtifacts = false withArtifacts = false
@ -410,8 +429,19 @@ object Tasks {
val interProjectRepo = InterProjectRepository(interProjectDependencies) val interProjectRepo = InterProjectRepository(interProjectDependencies)
val ivyHome = sys.props.getOrElse(
"ivy.home",
new File(sys.props("user.home")).toURI.getPath + ".ivy2"
)
val sbtIvyHome = sys.props.getOrElse(
"sbt.ivy.home",
ivyHome
)
val ivyProperties = Map( val ivyProperties = Map(
"ivy.home" -> (new File(sys.props("user.home")).toURI.getPath + ".ivy2") "ivy.home" -> ivyHome,
"sbt.ivy.home" -> sbtIvyHome
) ++ sys.props ) ++ sys.props
val useSbtCredentials = coursierUseSbtCredentials.value val useSbtCredentials = coursierUseSbtCredentials.value