Skip to content

Commit 0fe2c5c

Browse files
carl-mastrangelocarl-mastrangelo
authored
all: bump to proto 3.3.1
1 parent 530b714 commit 0fe2c5c

52 files changed

Lines changed: 1119 additions & 20 deletions

Some content is hidden

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

‎.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.2.0
8+
- PROTOBUF_VERSION=3.3.1
99
- LDFLAGS=-L/tmp/protobuf/lib
1010
- CXXFLAGS=-I/tmp/protobuf/include
1111
- LD_LIBRARY_PATH=/tmp/protobuf/lib

‎COMPILING.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ For Linux, Mac and MinGW:
3333
```
3434
$ git clone https://github.com/google/protobuf.git
3535
$ cd protobuf
36-
$ git checkout v3.2.0
36+
$ git checkout v3.3.1
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.2.0\src ^
76-
-PvcProtobufLibs=C:\path\to\protobuf-3.2.0\vsprojects\Release ^
75+
-PvcProtobufInclude=C:\path\to\protobuf-3.3.1\src ^
76+
-PvcProtobufLibs=C:\path\to\protobuf-3.3.1\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.2.0\\src
84-
vcProtobufLibs=C:\\path\\to\\protobuf-3.2.0\\vsprojects\\Release
83+
vcProtobufInclude=C:\\path\\to\\protobuf-3.3.1\\src
84+
vcProtobufLibs=C:\\path\\to\\protobuf-3.3.1\\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.2.0'
31+
artifact = 'com.google.protobuf:protoc:3.3.0'
3232
}
3333
plugins {
3434
grpc {

‎benchmarks/src/generated/main/java/io/grpc/benchmarks/proto/Control.java‎

Lines changed: 187 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)