Update sbt-shading to 2.0.0

This commit is contained in:
Alexandre Archambault 2020-05-12 00:16:06 +02:00
parent 9694d32083
commit e43be3d52d
3 changed files with 17 additions and 32 deletions

View File

@ -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

View File

@ -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._

View File

@ -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