From d729586e3a740a3870a01b32f6f9db1db5960a67 Mon Sep 17 00:00:00 2001
From: Alexandre Archambault <alexandre.archambault@gmail.com>
Date: Tue, 20 Nov 2018 18:09:27 +0100
Subject: [PATCH] Use resolver stuff of sbt-coursier from sbt-lm-coursier

Makes more scripted tests pass
---
 .../inter-project-resolvers/a/src/main/scala/A.scala          | 0
 .../inter-project-resolvers/b/src/main/scala/Main.scala       | 0
 .../inter-project-resolvers/build.sbt                         | 0
 .../inter-project-resolvers/project/plugins.sbt               | 0
 .../inter-project-resolvers/test                              | 0
 .../main/scala/coursier/sbtlmcoursier/LmCoursierPlugin.scala  | 4 ++--
 6 files changed, 2 insertions(+), 2 deletions(-)
 rename modules/sbt-coursier/src/sbt-test/{sbt-coursier-group-1 => shared-1}/inter-project-resolvers/a/src/main/scala/A.scala (100%)
 rename modules/sbt-coursier/src/sbt-test/{sbt-coursier-group-1 => shared-1}/inter-project-resolvers/b/src/main/scala/Main.scala (100%)
 rename modules/sbt-coursier/src/sbt-test/{sbt-coursier-group-1 => shared-1}/inter-project-resolvers/build.sbt (100%)
 rename modules/sbt-coursier/src/sbt-test/{sbt-coursier-group-1 => shared-1}/inter-project-resolvers/project/plugins.sbt (100%)
 rename modules/sbt-coursier/src/sbt-test/{sbt-coursier-group-1 => shared-1}/inter-project-resolvers/test (100%)

diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/inter-project-resolvers/a/src/main/scala/A.scala b/modules/sbt-coursier/src/sbt-test/shared-1/inter-project-resolvers/a/src/main/scala/A.scala
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/inter-project-resolvers/a/src/main/scala/A.scala
rename to modules/sbt-coursier/src/sbt-test/shared-1/inter-project-resolvers/a/src/main/scala/A.scala
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/inter-project-resolvers/b/src/main/scala/Main.scala b/modules/sbt-coursier/src/sbt-test/shared-1/inter-project-resolvers/b/src/main/scala/Main.scala
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/inter-project-resolvers/b/src/main/scala/Main.scala
rename to modules/sbt-coursier/src/sbt-test/shared-1/inter-project-resolvers/b/src/main/scala/Main.scala
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/inter-project-resolvers/build.sbt b/modules/sbt-coursier/src/sbt-test/shared-1/inter-project-resolvers/build.sbt
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/inter-project-resolvers/build.sbt
rename to modules/sbt-coursier/src/sbt-test/shared-1/inter-project-resolvers/build.sbt
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/inter-project-resolvers/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-1/inter-project-resolvers/project/plugins.sbt
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/inter-project-resolvers/project/plugins.sbt
rename to modules/sbt-coursier/src/sbt-test/shared-1/inter-project-resolvers/project/plugins.sbt
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/inter-project-resolvers/test b/modules/sbt-coursier/src/sbt-test/shared-1/inter-project-resolvers/test
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/inter-project-resolvers/test
rename to modules/sbt-coursier/src/sbt-test/shared-1/inter-project-resolvers/test
diff --git a/modules/sbt-lm-coursier/src/main/scala/coursier/sbtlmcoursier/LmCoursierPlugin.scala b/modules/sbt-lm-coursier/src/main/scala/coursier/sbtlmcoursier/LmCoursierPlugin.scala
index e53d5262a..8c1008059 100644
--- a/modules/sbt-lm-coursier/src/main/scala/coursier/sbtlmcoursier/LmCoursierPlugin.scala
+++ b/modules/sbt-lm-coursier/src/main/scala/coursier/sbtlmcoursier/LmCoursierPlugin.scala
@@ -32,7 +32,7 @@ object LmCoursierPlugin extends AutoPlugin {
 
   private def mkCoursierConfiguration: Def.Initialize[Task[CoursierConfiguration]] =
     Def.task {
-      val rs = fullResolvers.value.toVector
+      val rs = coursierRecursiveResolvers.value
       val interProjectDependencies = coursierInterProjectDependencies.value
       val excludeDeps = Inputs.exclusions(
         excludeDependencies.value,
@@ -43,7 +43,7 @@ object LmCoursierPlugin extends AutoPlugin {
       val s = streams.value
       Classpaths.warnResolversConflict(rs, s.log)
       CoursierConfiguration()
-        .withResolvers(rs)
+        .withResolvers(rs.toVector)
         .withInterProjectDependencies(interProjectDependencies.toVector)
         .withExcludeDependencies(
           excludeDeps