From e43be3d52d6b09412c1f3836c24573b6fd940c57 Mon Sep 17 00:00:00 2001
From: Alexandre Archambault <alexandre.archambault@gmail.com>
Date: Tue, 12 May 2020 00:16:06 +0200
Subject: [PATCH] Update sbt-shading to 2.0.0

---
 build.sbt              | 33 ++++++++++++++++-----------------
 project/Settings.scala | 14 --------------
 project/plugins.sbt    |  2 +-
 3 files changed, 17 insertions(+), 32 deletions(-)

diff --git a/build.sbt b/build.sbt
index db3673bad..43b2ecdf4 100644
--- a/build.sbt
+++ b/build.sbt
@@ -45,28 +45,27 @@ lazy val `lm-coursier-shaded` = project
     Mima.lmCoursierFilters,
     Mima.lmCoursierShadedFilters,
     unmanagedSourceDirectories.in(Compile) := unmanagedSourceDirectories.in(Compile).in(`lm-coursier`).value,
-    shading,
-    shadingNamespace := "lmcoursier.internal.shaded",
-    shadeNamespaces ++= Set(
-      "coursier",
-      "shapeless",
-      "argonaut",
-      "org.fusesource",
-      "macrocompat",
-      "io.github.alexarchambault.windowsansi"
-    ),
+    shadedModules += "io.get-coursier" %% "coursier",
+    validNamespaces += "lmcoursier",
+    shadingRules ++= {
+      val toShade = Seq(
+        "coursier",
+        "shapeless",
+        "argonaut",
+        "org.fusesource",
+        "macrocompat",
+        "io.github.alexarchambault.windowsansi"
+      )
+      for (ns <- toShade)
+        yield ShadingRule.moveUnder(ns, "lmcoursier.internal.shaded")
+    },
     libraryDependencies ++= Seq(
-      "io.get-coursier" %% "coursier" % coursierVersion0 % "shaded",
+      "io.get-coursier" %% "coursier" % coursierVersion0,
       "io.github.alexarchambault" %% "data-class" % "0.2.3" % Provided,
       "org.scala-lang.modules" %% "scala-xml" % "1.3.0", // depending on that one so that it doesn't get shaded
       "org.scala-sbt" %% "librarymanagement-ivy" % "1.3.2",
       "org.scalatest" %% "scalatest" % "3.1.2" % Test
-    ),
-    packageBin.in(Shading) := {
-      val jar = packageBin.in(Shading).value
-      Check.onlyNamespace("lmcoursier", jar)
-      jar
-    }
+    )
   )
 
 lazy val `sbt-coursier-shared` = project
diff --git a/project/Settings.scala b/project/Settings.scala
index 530c8f69d..3b4e1ee1c 100644
--- a/project/Settings.scala
+++ b/project/Settings.scala
@@ -6,7 +6,6 @@ import sbt.Keys._
 import sbt.ScriptedPlugin.autoImport.{scriptedBufferLog, scriptedLaunchOpts}
 
 import com.jsuereth.sbtpgp._
-import coursier.ShadingPlugin.autoImport.{Shading, shadingNamespace}
 
 object Settings {
 
@@ -65,19 +64,6 @@ object Settings {
       sbtVersion.in(pluginCrossBuild) := targetSbtVersion
     )
 
-  lazy val shading =
-    inConfig(Shading)(PgpSettings.projectSettings) ++
-       // Why does this have to be repeated here?
-       // Can't figure out why configuration gets lost without this in particular...
-      coursier.ShadingPlugin.projectSettings ++
-      Seq(
-        shadingNamespace := "coursier.shaded",
-        publish := publish.in(Shading).value,
-        publishLocal := publishLocal.in(Shading).value,
-        PgpKeys.publishSigned := PgpKeys.publishSigned.in(Shading).value,
-        PgpKeys.publishLocalSigned := PgpKeys.publishLocalSigned.in(Shading).value
-      )
-
   lazy val generatePropertyFile =
     resourceGenerators.in(Compile) += Def.task {
       import sys.process._
diff --git a/project/plugins.sbt b/project/plugins.sbt
index eb602ea76..ee0f31af4 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -2,6 +2,6 @@ addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.3")
 addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.7.0")
 
 addSbtPlugin("io.get-coursier" % "sbt-coursier" % "2.0.0-RC5-3")
-addSbtPlugin("io.get-coursier" % "sbt-shading" % "2.0.0-RC5-3")
+addSbtPlugin("io.get-coursier" % "sbt-shading" % "2.0.0")
 
 libraryDependencies += "org.scala-sbt" %% "scripted-plugin" % sbtVersion.value