raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

Update sbt-assembly to 0.15.0 (#29301)

Browse source 
* Update sbt-assembly to 0.15.0
* Fix shading

Co-authored-by: Arnout Engelen <arnout@bzzt.net>
This commit is contained in:
Scala Steward 2020-07-01 11:03:28 +02:00 • committed by GitHub
parent 6130b33e08
commit 37b1e6f118
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
build.sbt
View file

@ -313,7 +313,9 @@ lazy val protobufV3 = akkaModule("akka-protobuf-v3")
assemblyShadeRules in assembly := Seq( assemblyShadeRules in assembly := Seq(
ShadeRule ShadeRule
.rename("com.google.protobuf.**" -> "akka.protobufv3.internal.@1") .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), assemblyOption in assembly := (assemblyOption in assembly).value.copy(includeScala = false, includeBin = false),
autoScalaLibrary := false, // do not include scala dependency in pom autoScalaLibrary := false, // do not include scala dependency in pom
exportJars := true, // in dependent projects, use assembled and shaded jar exportJars := true, // in dependent projects, use assembled and shaded jar

2
project/plugins.sbt
View file

@ -1,5 +1,5 @@
libraryDependencies += Defaults.sbtPluginExtra( libraryDependencies += Defaults.sbtPluginExtra(
"com.eed3si9n" % "sbt-assembly" % "0.14.10", "com.eed3si9n" % "sbt-assembly" % "0.15.0",
(sbtBinaryVersion in pluginCrossBuild).value, (sbtBinaryVersion in pluginCrossBuild).value,
(scalaBinaryVersion in pluginCrossBuild).value) (scalaBinaryVersion in pluginCrossBuild).value)