From 37b1e6f11815b0e8ad0457bf96de5034f41c4a75 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Wed, 1 Jul 2020 11:03:28 +0200 Subject: [PATCH] Update sbt-assembly to 0.15.0 (#29301) * Update sbt-assembly to 0.15.0 * Fix shading Co-authored-by: Arnout Engelen --- build.sbt | 4 +++- project/plugins.sbt | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 76930451dc..42c233ded0 100644 --- a/build.sbt +++ b/build.sbt @@ -313,7 +313,9 @@ lazy val protobufV3 = akkaModule("akka-protobuf-v3") assemblyShadeRules in assembly := Seq( ShadeRule .rename("com.google.protobuf.**" -> "akka.protobufv3.internal.@1") - .inLibrary(Dependencies.Compile.Provided.protobufRuntime)), + // https://github.com/sbt/sbt-assembly/issues/400 + .inLibrary(Dependencies.Compile.Provided.protobufRuntime) + .inProject), assemblyOption in assembly := (assemblyOption in assembly).value.copy(includeScala = false, includeBin = false), autoScalaLibrary := false, // do not include scala dependency in pom exportJars := true, // in dependent projects, use assembled and shaded jar diff --git a/project/plugins.sbt b/project/plugins.sbt index 727bf1272c..b3b1fcffbf 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,5 +1,5 @@ libraryDependencies += Defaults.sbtPluginExtra( - "com.eed3si9n" % "sbt-assembly" % "0.14.10", + "com.eed3si9n" % "sbt-assembly" % "0.15.0", (sbtBinaryVersion in pluginCrossBuild).value, (scalaBinaryVersion in pluginCrossBuild).value)