From 972a7d0ebe39c096664a5e85e88a0e43518fd397 Mon Sep 17 00:00:00 2001
From: Alexandre Archambault <alexandre.archambault@gmail.com>
Date: Sun, 6 Aug 2017 21:13:54 +0200
Subject: [PATCH] Add extra path to get org.scala-sbt:global-plugins:0.0

As this relies on global stuff, it's not straightforward to test... A
docker-based integration test could be added later...
---
 .../src/main/scala/coursier/Tasks.scala       | 58 ++++++++++++-------
 1 file changed, 37 insertions(+), 21 deletions(-)

diff --git a/sbt-coursier/src/main/scala/coursier/Tasks.scala b/sbt-coursier/src/main/scala/coursier/Tasks.scala
index 5d4551e97..7bb668403 100644
--- a/sbt-coursier/src/main/scala/coursier/Tasks.scala
+++ b/sbt-coursier/src/main/scala/coursier/Tasks.scala
@@ -411,7 +411,7 @@ object Tasks {
 
   private def createLogger() = new TermDisplay(new OutputStreamWriter(System.err))
 
-  private lazy val globalPluginPattern = {
+  private lazy val globalPluginPatterns = {
 
     val props = sys.props.toMap
 
@@ -426,23 +426,37 @@ object Tasks {
     addUriProp("sbt.global.base")
     addUriProp("user.home")
 
+    def pattern(s: String): coursier.ivy.Pattern = {
+      val p = PropertiesPattern.parse(s) match {
+        case -\/(err) =>
+          throw new Exception(s"Cannot parse pattern $s: $err")
+        case \/-(p) =>
+          p
+      }
+
+      p.substituteProperties(props ++ extraProps) match {
+        case -\/(err) =>
+          throw new Exception(err)
+        case \/-(p) =>
+          p
+      }
+    }
+
     // FIXME get the 0.13 automatically?
-    val s = s"$${sbt.global.base.uri-$${user.home.uri}/.sbt/0.13}/plugins/target/resolution-cache/" +
+    val defaultRawPattern = s"$${sbt.global.base.uri-$${user.home.uri}/.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
-    }
+    // 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" +
+      "(/scala-[scalaVersion])(/sbt-[sbtVersion])" +
+      "/resolution-cache/" +
+      "[organization]/[module](/scala_[scalaVersion])(/sbt_[sbtVersion])/[revision]/resolved.xml.[ext]"
 
-    p.substituteProperties(props ++ extraProps) match {
-      case -\/(err) =>
-        throw new Exception(err)
-      case \/-(p) =>
-        p
-    }
+    Seq(
+      defaultRawPattern,
+      extraRawPattern
+    ).map(pattern)
   }
 
   def parentProjectCacheTask: Def.Initialize[sbt.Task[Map[Seq[sbt.Resolver],Seq[coursier.ProjectCache]]]] =
@@ -608,12 +622,14 @@ object Tasks {
           log.info(s"  ${p.module}:${p.version}")
       }
 
-      val globalPluginsRepo = IvyRepository.fromPattern(
-        globalPluginPattern,
-        withChecksums = false,
-        withSignatures = false,
-        withArtifacts = false
-      )
+      val globalPluginsRepos =
+        for (p <- globalPluginPatterns)
+          yield IvyRepository.fromPattern(
+            p,
+            withChecksums = false,
+            withSignatures = false,
+            withArtifacts = false
+          )
 
       val interProjectRepo = InterProjectRepository(interProjectDependencies)
 
@@ -704,7 +720,7 @@ object Tasks {
         }
       }
 
-      val internalRepositories = Seq(globalPluginsRepo, interProjectRepo)
+      val internalRepositories = globalPluginsRepos :+ interProjectRepo
 
       val repositories =
         internalRepositories ++