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

Fix hard-coded sbt binary version

This commit is contained in:
Alexandre Archambault 2017-08-30 01:01:06 +02:00
parent 10c65c6062
commit 372a29c1ee
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sbt-coursier/src/main/scala/coursier/Tasks.scala
View File

@ -411,7 +411,7 @@ object Tasks {
private def createLogger() = new TermDisplay(new OutputStreamWriter(System.err)) private def createLogger() = new TermDisplay(new OutputStreamWriter(System.err))
private lazy val globalPluginPatterns = { private def globalPluginPatterns(sbtVersion: String): Seq[coursier.ivy.Pattern] = {
val props = sys.props.toMap val props = sys.props.toMap
@ -443,12 +443,12 @@ object Tasks {
} }
// FIXME get the 0.13 automatically? // FIXME get the 0.13 automatically?
val defaultRawPattern = s"$${sbt.global.base.uri-$${user.home.uri}/.sbt/0.13}/plugins/target" + val defaultRawPattern = s"$${sbt.global.base.uri-$${user.home.uri}/.sbt/$sbtVersion}/plugins/target" +
"/resolution-cache/" + "/resolution-cache/" +
"[organization]/[module](/scala_[scalaVersion])(/sbt_[sbtVersion])/[revision]/resolved.xml.[ext]" "[organization]/[module](/scala_[scalaVersion])(/sbt_[sbtVersion])/[revision]/resolved.xml.[ext]"
// seems to be required in more recent versions of sbt (since 0.13.16?) // seems to be required in more recent versions of sbt (since 0.13.16?)
val extraRawPattern = s"$${sbt.global.base.uri-$${user.home.uri}/.sbt/0.13}/plugins/target" + val extraRawPattern = s"$${sbt.global.base.uri-$${user.home.uri}/.sbt/$sbtVersion}/plugins/target" +
"(/scala-[scalaVersion])(/sbt-[sbtVersion])" + "(/scala-[scalaVersion])(/sbt-[sbtVersion])" +
"/resolution-cache/" + "/resolution-cache/" +
"[organization]/[module](/scala_[scalaVersion])(/sbt_[sbtVersion])/[revision]/resolved.xml.[ext]" "[organization]/[module](/scala_[scalaVersion])(/sbt_[sbtVersion])/[revision]/resolved.xml.[ext]"
@ -623,7 +623,7 @@ object Tasks {
} }
val globalPluginsRepos = val globalPluginsRepos =
for (p <- globalPluginPatterns) for (p <- globalPluginPatterns(sbtBinaryVersion.value))
yield IvyRepository.fromPattern( yield IvyRepository.fromPattern(
p, p,
withChecksums = false, withChecksums = false,