From ab55269e6347b32a1fd559df6e28a735fc63232e Mon Sep 17 00:00:00 2001
From: Alexandre Archambault <alexarchambault@users.noreply.github.com>
Date: Mon, 5 Aug 2019 16:03:09 +0200
Subject: [PATCH] Fix 2.0.0-RC3 regression (#113)

Disable classpath ordering of JARs for now

New coursier 2.0.0-RC3 feature, maybe enabled too early here.
---
 .../scala/lmcoursier/internal/ArtifactsRun.scala    |  1 +
 .../src/sbt-test/shared-2/sbt-ci-release/build.sbt  |  1 +
 .../shared-2/sbt-ci-release/project/plugins.sbt     |  2 ++
 .../sbt-ci-release/project/project/plugins.sbt      | 13 +++++++++++++
 .../src/sbt-test/shared-2/sbt-ci-release/test       |  1 +
 5 files changed, 18 insertions(+)
 create mode 100644 modules/sbt-coursier/src/sbt-test/shared-2/sbt-ci-release/build.sbt
 create mode 100644 modules/sbt-coursier/src/sbt-test/shared-2/sbt-ci-release/project/plugins.sbt
 create mode 100644 modules/sbt-coursier/src/sbt-test/shared-2/sbt-ci-release/project/project/plugins.sbt
 create mode 100644 modules/sbt-coursier/src/sbt-test/shared-2/sbt-ci-release/test

diff --git a/modules/lm-coursier/src/main/scala/lmcoursier/internal/ArtifactsRun.scala b/modules/lm-coursier/src/main/scala/lmcoursier/internal/ArtifactsRun.scala
index dc5563d86..b67e64318 100644
--- a/modules/lm-coursier/src/main/scala/lmcoursier/internal/ArtifactsRun.scala
+++ b/modules/lm-coursier/src/main/scala/lmcoursier/internal/ArtifactsRun.scala
@@ -35,6 +35,7 @@ object ArtifactsRun {
           .withResolutions(params.resolutions)
           .withArtifactTypes(Set(Type.all))
           .withClassifiers(params.classifiers.getOrElse(Nil).toSet)
+          .withClasspathOrder(false)
           .addExtraArtifacts { l =>
             if (params.includeSignatures)
               l.flatMap(_._3.extra.get("sig").toSeq)
diff --git a/modules/sbt-coursier/src/sbt-test/shared-2/sbt-ci-release/build.sbt b/modules/sbt-coursier/src/sbt-test/shared-2/sbt-ci-release/build.sbt
new file mode 100644
index 000000000..cac761e5c
--- /dev/null
+++ b/modules/sbt-coursier/src/sbt-test/shared-2/sbt-ci-release/build.sbt
@@ -0,0 +1 @@
+scalaVersion := "2.13.0"
diff --git a/modules/sbt-coursier/src/sbt-test/shared-2/sbt-ci-release/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-2/sbt-ci-release/project/plugins.sbt
new file mode 100644
index 000000000..2ba44cb94
--- /dev/null
+++ b/modules/sbt-coursier/src/sbt-test/shared-2/sbt-ci-release/project/plugins.sbt
@@ -0,0 +1,2 @@
+addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.2.6")
+addSbtCoursier
diff --git a/modules/sbt-coursier/src/sbt-test/shared-2/sbt-ci-release/project/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-2/sbt-ci-release/project/project/plugins.sbt
new file mode 100644
index 000000000..71a44ffd3
--- /dev/null
+++ b/modules/sbt-coursier/src/sbt-test/shared-2/sbt-ci-release/project/project/plugins.sbt
@@ -0,0 +1,13 @@
+addSbtPlugin {
+
+  val name = sys.props.getOrElse(
+    "plugin.name",
+    sys.error("plugin.name Java property not set")
+  )
+  val version = sys.props.getOrElse(
+    "plugin.version",
+    sys.error("plugin.version Java property not set")
+  )
+
+  "io.get-coursier" % name % version
+}
\ No newline at end of file
diff --git a/modules/sbt-coursier/src/sbt-test/shared-2/sbt-ci-release/test b/modules/sbt-coursier/src/sbt-test/shared-2/sbt-ci-release/test
new file mode 100644
index 000000000..5df2af1f3
--- /dev/null
+++ b/modules/sbt-coursier/src/sbt-test/shared-2/sbt-ci-release/test
@@ -0,0 +1 @@
+> compile