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

Merge pull request #28974 from akka/wip-28939-protobuf-dep-patriknw

Browse source
This commit is contained in:
Renato Cavalcanti 2020-04-27 17:35:49 +02:00 • committed by GitHub
commit 8e0c8d07b9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
build.sbt
View file

@ -297,11 +297,11 @@ lazy val protobufV3 = akkaModule("akka-protobuf-v3")
.enablePlugins(ScaladocNoVerificationOfDiagrams) .enablePlugins(ScaladocNoVerificationOfDiagrams)
.disablePlugins(MimaPlugin) .disablePlugins(MimaPlugin)
.settings( .settings(
libraryDependencies += Dependencies.Compile.protobufRuntime, libraryDependencies += Dependencies.Compile.Provided.protobufRuntime,
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.protobufRuntime)), .inLibrary(Dependencies.Compile.Provided.protobufRuntime)),
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

4
project/Dependencies.scala
View file

@ -92,8 +92,6 @@ object Dependencies {
val jacksonParameterNames = "com.fasterxml.jackson.module" % "jackson-module-parameter-names" % jacksonVersion // ApacheV2 val jacksonParameterNames = "com.fasterxml.jackson.module" % "jackson-module-parameter-names" % jacksonVersion // ApacheV2
val jacksonCbor = "com.fasterxml.jackson.dataformat" % "jackson-dataformat-cbor" % jacksonVersion // ApacheV2 val jacksonCbor = "com.fasterxml.jackson.dataformat" % "jackson-dataformat-cbor" % jacksonVersion // ApacheV2
val protobufRuntime = "com.google.protobuf" % "protobuf-java" % protobufJavaVersion
val logback = "ch.qos.logback" % "logback-classic" % logbackVersion // EPL 1.0 val logback = "ch.qos.logback" % "logback-classic" % logbackVersion // EPL 1.0
object Docs { object Docs {
@ -162,6 +160,8 @@ object Dependencies {
val logback = Compile.logback % "optional;provided;test" // EPL 1.0 val logback = Compile.logback % "optional;provided;test" // EPL 1.0
val protobufRuntime = "com.google.protobuf" % "protobuf-java" % protobufJavaVersion % "optional;provided"
} }
} }