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

Merge pull request #29014 from akka/wip-protobuf-3.11-patriknw

Browse source 
update protobuf 3.11.4
This commit is contained in:
Patrik Nordwall 2020-05-08 12:23:59 +02:00 • committed by GitHub
commit 39a785d500
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
17 changed files with 45 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
project/Dependencies.scala
View file

@ -22,7 +22,7 @@ object Dependencies {
val agronaVersion = "1.4.1"
val nettyVersion = "3.10.6.Final"
val jacksonVersion = "2.10.4"
val protobufJavaVersion = "3.10.0"
val protobufJavaVersion = "3.11.4"
val logbackVersion = "1.2.3"
val scala212Version = "2.12.11"

2
project/Protobuf.scala
View file

@ -32,7 +32,7 @@ object Protobuf {
Compile / unmanagedJars ++= Seq(
baseDirectory.value / ".." / "akka-protobuf-v3" / "target" / s"scala-${scalaBinaryVersion.value}" / s"akka-protobuf-v3-assembly-${version.value}.jar"),
protoc := "protoc",
protocVersion := "3.10.0",
protocVersion := "3.11.4",
generate := {
val sourceDirs = paths.value
val targetDirs = outputPaths.value