Skip to content

Commit dbef1af

Browse files
ejona86ejona86
committed
Bump protobuf dependency to 3.0.0-beta-3
This allows us to play with zero-copy and proto3 support for lite. Unfortunately, it introduced some warnings, so deprecated warnings are now ignored for benchmarks and interop-testing.
1 parent fe5b7e3 commit dbef1af

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+3650
-3791
lines changed

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ language: java
55
env:
66
global:
77
- GRADLE_OPTS=-Xmx512m
8-
- PROTOBUF_VERSION=3.0.0-beta-2
8+
- PROTOBUF_VERSION=3.0.0-beta-3
99
- LDFLAGS=-L/tmp/protobuf/lib
1010
- CXXFLAGS=-I/tmp/protobuf/include
1111
- LD_LIBRARY_PATH=/tmp/protobuf/lib

‎COMPILING.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ This section is only necessary if you are making changes to the code
2727
generation. Most users only need to use `skipCodegen=true` as discussed above.
2828

2929
### Build Protobuf
30-
The codegen plugin is C++ code and requires protobuf 3.0.0-beta-2.
30+
The codegen plugin is C++ code and requires protobuf 3.0.0-beta-3.
3131

3232
For Linux, Mac and MinGW:
3333
```
3434
$ git clone https://github.com/google/protobuf.git
3535
$ cd protobuf
36-
$ git checkout v3.0.0-beta-2
36+
$ git checkout v3.0.0-beta-3
3737
$ ./autogen.sh
3838
$ ./configure
3939
$ make
@@ -72,16 +72,16 @@ When building on Windows and VC++, you need to specify project properties for
7272
Gradle to find protobuf:
7373
```
7474
.\gradlew install ^
75-
-PvcProtobufInclude=C:\path\to\protobuf-3.0.0-beta-2\src ^
76-
-PvcProtobufLibs=C:\path\to\protobuf-3.0.0-beta-2\vsprojects\Release ^
75+
-PvcProtobufInclude=C:\path\to\protobuf-3.0.0-beta-3\src ^
76+
-PvcProtobufLibs=C:\path\to\protobuf-3.0.0-beta-3\vsprojects\Release ^
7777
-PtargetArch=x86_32
7878
```
7979

8080
Since specifying those properties every build is bothersome, you can instead
8181
create ``<project-root>\gradle.properties`` with contents like:
8282
```
83-
vcProtobufInclude=C:\\path\\to\\protobuf-3.0.0-beta-2\\src
84-
vcProtobufLibs=C:\\path\\to\\protobuf-3.0.0-beta-2\\vsprojects\\Release
83+
vcProtobufInclude=C:\\path\\to\\protobuf-3.0.0-beta-3\\src
84+
vcProtobufLibs=C:\\path\\to\\protobuf-3.0.0-beta-3\\vsprojects\\Release
8585
targetArch=x86_32
8686
```
8787

‎android-interop-testing/app/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ android {
2828

2929
protobuf {
3030
protoc {
31-
artifact = 'com.google.protobuf:protoc:3.0.0-beta-2'
31+
artifact = 'com.google.protobuf:protoc:3.0.0-beta-3'
3232
}
3333
plugins {
3434
grpc {

0 commit comments

Comments
 (0)