Bump to protobuf-java 3.5.0

talpr · Dec 3, 2017 · 2a0d61d · 2a0d61d
1 parent 3de8de6
commit 2a0d61d
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 18 deletions.
diff --git a/build.sbt b/build.sbt
@@ -176,7 +176,7 @@ lazy val proptest = project.in(file("proptest"))
       publishArtifact := false,
       publishTo := Some(Resolver.file("Unused transient repository", file("target/unusedrepo"))),
       libraryDependencies ++= Seq(
-        "com.github.os72" % "protoc-jar" % "3.4.0",
+        "com.github.os72" % "protoc-jar" % "3.5.0",
         "com.google.protobuf" % "protobuf-java" % protobufVersion,
         "io.grpc" % "grpc-netty" % grpcVersion % "test",
         "io.grpc" % "grpc-protobuf" % grpcVersion % "test",
@@ -196,7 +196,7 @@ lazy val proptest = project.in(file("proptest"))
 
 lazy val ShortTest = config("short") extend(Test)
 
-val protobufVersion = "3.4.0"
+val protobufVersion = "3.5.0"
 
 // For e2e test
 val sbtPluginVersion = "0.99.13"

diff --git a/compiler-plugin/build.sbt b/compiler-plugin/build.sbt
@@ -1,3 +1,3 @@
 libraryDependencies ++= Seq(
-  "com.google.protobuf" % "protobuf-java" % "3.4.0"
+  "com.google.protobuf" % "protobuf-java" % "3.5.0"
 )
diff --git a/compiler-plugin/src/main/java/scalapb/options/compiler/Scalapb.java b/compiler-plugin/src/main/java/scalapb/options/compiler/Scalapb.java
diff --git a/scalapb-runtime/jvm/src/main/java/scalapb/options/Scalapb.java b/scalapb-runtime/jvm/src/main/java/scalapb/options/Scalapb.java
diff --git a/test_generated_code_checked_in.sh b/test_generated_code_checked_in.sh
@@ -2,7 +2,7 @@
 # Test that all generated code is checked in.
 set -e
 
-echo "java -jar ${HOME}/.ivy2/cache/com.github.os72/protoc-jar/jars/protoc-jar-3.4.0.jar \$@" > protoc
+echo "java -jar ${HOME}/.ivy2/cache/com.github.os72/protoc-jar/jars/protoc-jar-3.5.0.jar \$@" > protoc
 chmod +x protoc
 PATH=${PATH}:${PWD} ./make_plugin_proto.sh
 rm protoc