Update protobuf to 3.0.0

Fixes grpc#2086
qingfeng0820 · Jul 29, 2016 · 5e1e883 · 5e1e883
1 parent fccc282
commit 5e1e883
Show file tree

Hide file tree

Showing 31 changed files with 5,401 additions and 1,195 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,7 +5,7 @@ language: java
 env:
   global:
     - GRADLE_OPTS=-Xmx512m
-    - PROTOBUF_VERSION=3.0.0-beta-3
+    - PROTOBUF_VERSION=3.0.0
     - LDFLAGS=-L/tmp/protobuf/lib
     - CXXFLAGS=-I/tmp/protobuf/include
     - LD_LIBRARY_PATH=/tmp/protobuf/lib

diff --git a/COMPILING.md b/COMPILING.md
@@ -27,13 +27,13 @@ This section is only necessary if you are making changes to the code
 generation. Most users only need to use `skipCodegen=true` as discussed above.
 
 ### Build Protobuf
-The codegen plugin is C++ code and requires protobuf 3.0.0-beta-3.
+The codegen plugin is C++ code and requires protobuf 3.0.0.
 
 For Linux, Mac and MinGW:
 ```
 $ git clone https://github.com/google/protobuf.git
 $ cd protobuf
-$ git checkout v3.0.0-beta-3
+$ git checkout v3.0.0
 $ ./autogen.sh
 $ ./configure
 $ make
@@ -72,16 +72,16 @@ When building on Windows and VC++, you need to specify project properties for
 Gradle to find protobuf:
 ```
 .\gradlew install ^
-    -PvcProtobufInclude=C:\path\to\protobuf-3.0.0-beta-3\src ^
-    -PvcProtobufLibs=C:\path\to\protobuf-3.0.0-beta-3\vsprojects\Release ^
+    -PvcProtobufInclude=C:\path\to\protobuf-3.0.0\src ^
+    -PvcProtobufLibs=C:\path\to\protobuf-3.0.0\vsprojects\Release ^
     -PtargetArch=x86_32
 ```
 
 Since specifying those properties every build is bothersome, you can instead
 create ``<project-root>\gradle.properties`` with contents like:
 ```
-vcProtobufInclude=C:\\path\\to\\protobuf-3.0.0-beta-3\\src
-vcProtobufLibs=C:\\path\\to\\protobuf-3.0.0-beta-3\\vsprojects\\Release
+vcProtobufInclude=C:\\path\\to\\protobuf-3.0.0\\src
+vcProtobufLibs=C:\\path\\to\\protobuf-3.0.0\\vsprojects\\Release
 targetArch=x86_32
 ```
 

diff --git a/android-interop-testing/app/build.gradle b/android-interop-testing/app/build.gradle
@@ -28,7 +28,7 @@ android {
 
 protobuf {
     protoc {
-        artifact = 'com.google.protobuf:protoc:3.0.0-beta-3'
+        artifact = 'com.google.protobuf:protoc:3.0.0'
     }
     plugins {
         grpc {