Skip to content

Commit eaca734

Browse files
ejona86ejona86
authored
Upgrade to protobuf 3.6.1
For Bazel, we upgrade to protobuf 3.6.1.2 and javalite HEAD to fix incompatibilities in newer Bazel releases. compiler/Dockerfile is unused, so it was removed instead of being updated. protoc no longer includes codegen for nano, so we remain on the older protoc any time nano is used. Protobuf now requires C++11 when compiling, so windows was swapped to VC 14.
1 parent e4045f8 commit eaca734

File tree

193 files changed

+8275
-1718
lines changed

Some content is hidden

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

193 files changed

+8275
-1718
lines changed

‎COMPILING.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ For Linux, Mac and MinGW:
4444
```
4545
$ git clone https://github.com/google/protobuf.git
4646
$ cd protobuf
47-
$ git checkout v3.5.1
47+
$ git checkout v3.6.1
4848
$ ./autogen.sh
4949
$ ./configure
5050
$ make
@@ -83,16 +83,16 @@ When building on Windows and VC++, you need to specify project properties for
8383
Gradle to find protobuf:
8484
```
8585
.\gradlew publishToMavenLocal ^
86-
-PvcProtobufInclude=C:\path\to\protobuf-3.5.1\src ^
87-
-PvcProtobufLibs=C:\path\to\protobuf-3.5.1\vsprojects\Release ^
86+
-PvcProtobufInclude=C:\path\to\protobuf-3.6.1\src ^
87+
-PvcProtobufLibs=C:\path\to\protobuf-3.6.1\vsprojects\Release ^
8888
-PtargetArch=x86_32
8989
```
9090

9191
Since specifying those properties every build is bothersome, you can instead
9292
create ``<project-root>\gradle.properties`` with contents like:
9393
```
94-
vcProtobufInclude=C:\\path\\to\\protobuf-3.5.1\\src
95-
vcProtobufLibs=C:\\path\\to\\protobuf-3.5.1\\vsprojects\\Release
94+
vcProtobufInclude=C:\\path\\to\\protobuf-3.6.1\\src
95+
vcProtobufLibs=C:\\path\\to\\protobuf-3.6.1\\vsprojects\\Release
9696
targetArch=x86_32
9797
```
9898

‎alts/src/generated/main/java/io/grpc/alts/internal/AltsContext.java‎

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

0 commit comments

Comments
 (0)