From 2bc1aebba50492fe78c0b7999ac2518b47b34670 Mon Sep 17 00:00:00 2001
From: Alexandre Archambault <alexandre.archambault@gmail.com>
Date: Fri, 3 Mar 2017 21:00:31 +0100
Subject: [PATCH] Switch to sbt-coursier / sbt-shading 1.0.0-M15-5

Should not require pulling a custom version of jarjar
---
 project/plugins.sbt         | 29 ++---------------------------
 project/project/plugins.sbt |  2 +-
 sbt.properties              |  5 ++---
 3 files changed, 5 insertions(+), 31 deletions(-)

diff --git a/project/plugins.sbt b/project/plugins.sbt
index a896010c4..18ed9fbe5 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -3,33 +3,8 @@ addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.14")
 addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0")
 addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.4.0")
 addSbtPlugin("org.tpolecat" % "tut-plugin" % "0.4.8")
-addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-M15-2")
-addSbtPlugin("io.get-coursier" % "sbt-shading" % "1.0.0-M15-2")
+addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-M15-5")
+addSbtPlugin("io.get-coursier" % "sbt-shading" % "1.0.0-M15-5")
 addSbtPlugin("com.typesafe.sbt" % "sbt-proguard" % "0.2.2")
 addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.1.13")
 libraryDependencies += "org.scala-sbt" % "scripted-plugin" % sbtVersion.value
-
-// temporary, until sbt-shading 1.0.0-M15-3 (that will pull a fine jarjar version)
-resolvers += Resolver.mavenLocal
-libraryDependencies += {
-
-  def jarjarVersion = {
-    val coursierJarjarVersion = "1.0.1-coursier-SNAPSHOT"
-    val fallbackJarjarVersion = "1.0.0"
-    def coursierJarjarFoundInM2 = (file(sys.props("user.home")) / s".m2/repository/org/anarres/jarjar/jarjar-core/$coursierJarjarVersion").exists()
-
-    if (sys.env.contains("CI") || coursierJarjarFoundInM2)
-      coursierJarjarVersion
-    else {
-      scala.Console.err.println(
-        "Ad hoc jarjar version not found. Run\n" +
-        "  git clone https://github.com/alexarchambault/jarjar.git && cd jarjar && git checkout 249c8dbb970f8 && ./gradlew install\n" +
-        s"to install it. Using version $fallbackJarjarVersion, that doesn't properly\n" +
-        "shade Scala JARs."
-      )
-      fallbackJarjarVersion
-    }
-  }
-
-  "org.anarres.jarjar" % "jarjar-core" % jarjarVersion
-}
diff --git a/project/project/plugins.sbt b/project/project/plugins.sbt
index f4f811693..53b32814e 100644
--- a/project/project/plugins.sbt
+++ b/project/project/plugins.sbt
@@ -1 +1 @@
-addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-M15-2")
+addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-M15-5")
diff --git a/sbt.properties b/sbt.properties
index 9046505f9..7de236491 100644
--- a/sbt.properties
+++ b/sbt.properties
@@ -1,8 +1,8 @@
 sbt.version=0.13.8
 
 plugins = [
-  "io.get-coursier:sbt-coursier:1.0.0-M15-2"
-  "io.get-coursier:sbt-shading:1.0.0-M15-2"
+  "io.get-coursier:sbt-coursier:1.0.0-M15-5"
+  "io.get-coursier:sbt-shading:1.0.0-M15-5"
   "org.xerial.sbt:sbt-pack:0.8.2"
   "org.scala-js:sbt-scalajs:0.6.14"
   "com.jsuereth:sbt-pgp:1.0.0"
@@ -14,5 +14,4 @@ plugins = [
 
 dependencies = [
   "org.scala-sbt:scripted-plugin:"${sbt.version}
-  "org.anarres.jarjar:jarjar-core:1.0.1-coursier-SNAPSHOT"
 ]