Skip to content

Commit a251171

Browse files
committed
Upgrade to protobuf-3.0.0-alpha-3
1 parent cd2bc1e commit a251171

33 files changed

Lines changed: 1387 additions & 942 deletions

File tree

README.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ For protobuf-based codegen integrated with the Maven build system, you can use
4646
<artifactId>maven-protoc-plugin</artifactId>
4747
<version>0.4.2</version>
4848
<configuration>
49-
<protocArtifact>com.google.protobuf:protoc:3.0.0-alpha-2:exe:${os.detected.classifier}</protocArtifact>
49+
<protocArtifact>com.google.protobuf:protoc:3.0.0-alpha-3:exe:${os.detected.classifier}</protocArtifact>
5050
<pluginId>grpc-java</pluginId>
5151
<pluginArtifact>io.grpc:protoc-gen-grpc-java:0.7.0:exe:${os.detected.classifier}</pluginArtifact>
5252
</configuration>
@@ -89,7 +89,7 @@ sourceSets {
8989
}
9090
}
9191
92-
protocDep = "com.google.protobuf:protoc:3.0.0-alpha-2"
92+
protocDep = "com.google.protobuf:protoc:3.0.0-alpha-3"
9393
protobufNativeCodeGenPluginDeps = ["grpc:io.grpc:protoc-gen-grpc-java:0.7.0"]
9494
```
9595

@@ -133,13 +133,13 @@ This section is only necessary if you are making changes to the code
133133
generation. Most users only need to use `skipCodegen=true` as discussed above.
134134

135135
### Build Protobuf
136-
The codegen plugin is C++ code and requires protobuf 3.0.0-alpha-2.
136+
The codegen plugin is C++ code and requires protobuf 3.0.0-alpha-3.
137137

138138
For Linux, Mac and MinGW:
139139
```
140140
$ git clone https://github.com/google/protobuf.git
141141
$ cd protobuf
142-
$ git checkout v3.0.0-alpha-2
142+
$ git checkout v3.0.0-alpha-3
143143
$ ./autogen.sh
144144
$ ./configure
145145
$ make
@@ -178,15 +178,15 @@ When building on Windows and VC++, you need to specify project properties for
178178
Gradle to find protobuf:
179179
```
180180
.\gradlew install ^
181-
-PvcProtobufInclude=C:\path\to\protobuf-3.0.0-alpha-2\src ^
182-
-PvcProtobufLibs=C:\path\to\protobuf-3.0.0-alpha-2\vsprojects\Release
181+
-PvcProtobufInclude=C:\path\to\protobuf-3.0.0-alpha-3\src ^
182+
-PvcProtobufLibs=C:\path\to\protobuf-3.0.0-alpha-3\vsprojects\Release
183183
```
184184

185185
Since specifying those properties every build is bothersome, you can instead
186186
create ``<project-root>\gradle.properties`` with contents like:
187187
```
188-
vcProtobufInclude=C:\\path\\to\\protobuf-3.0.0-alpha-2\\src
189-
vcProtobufLibs=C:\\path\\to\\protobuf-3.0.0-alpha-2\\vsprojects\\Release
188+
vcProtobufInclude=C:\\path\\to\\protobuf-3.0.0-alpha-3\\src
189+
vcProtobufLibs=C:\\path\\to\\protobuf-3.0.0-alpha-3\\vsprojects\\Release
190190
```
191191

192192
The build script will build the codegen for the same architecture as the Java

benchmarks/src/generated/main/io/grpc/testing/ClientArgs.java

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

benchmarks/src/generated/main/io/grpc/testing/ClientConfig.java

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

0 commit comments

Comments
 (0)