Skip to content

Commit af9fb6d

Browse files
zhangkun83zhangkun83
committed
Migrate from PARSER to parser() as a way of getting the parser of a protobuf message.
Upgrade to protobuf-3.0.0-alpha-3.1 that adds parser(). PARSER will go away eventually.
1 parent 7a71627 commit af9fb6d

35 files changed

Lines changed: 179 additions & 55 deletions

‎README.md‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ For protobuf-based codegen integrated with the Maven build system, you can use
6363
<artifactId>maven-protoc-plugin</artifactId>
6464
<version>0.4.2</version>
6565
<configuration>
66-
<protocArtifact>com.google.protobuf:protoc:3.0.0-alpha-3:exe:${os.detected.classifier}</protocArtifact>
66+
<protocArtifact>com.google.protobuf:protoc:3.0.0-alpha-3.1:exe:${os.detected.classifier}</protocArtifact>
6767
<pluginId>grpc-java</pluginId>
6868
<pluginArtifact>io.grpc:protoc-gen-grpc-java:0.7.1:exe:${os.detected.classifier}</pluginArtifact>
6969
</configuration>
@@ -106,7 +106,7 @@ sourceSets {
106106
}
107107
}
108108
109-
protocDep = "com.google.protobuf:protoc:3.0.0-alpha-3"
109+
protocDep = "com.google.protobuf:protoc:3.0.0-alpha-3.1"
110110
protobufNativeCodeGenPluginDeps = ["grpc:io.grpc:protoc-gen-grpc-java:0.7.1"]
111111
```
112112

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

152152
### Build Protobuf
153-
The codegen plugin is C++ code and requires protobuf 3.0.0-alpha-3.
153+
The codegen plugin is C++ code and requires protobuf 3.0.0-alpha-3.1.
154154

155155
For Linux, Mac and MinGW:
156156
```
157157
$ git clone https://github.com/google/protobuf.git
158158
$ cd protobuf
159-
$ git checkout v3.0.0-alpha-3
159+
$ git checkout v3.0.0-alpha-3.1
160160
$ ./autogen.sh
161161
$ ./configure
162162
$ make
@@ -195,15 +195,15 @@ When building on Windows and VC++, you need to specify project properties for
195195
Gradle to find protobuf:
196196
```
197197
.\gradlew install ^
198-
-PvcProtobufInclude=C:\path\to\protobuf-3.0.0-alpha-3\src ^
199-
-PvcProtobufLibs=C:\path\to\protobuf-3.0.0-alpha-3\vsprojects\Release
198+
-PvcProtobufInclude=C:\path\to\protobuf-3.0.0-alpha-3.1\src ^
199+
-PvcProtobufLibs=C:\path\to\protobuf-3.0.0-alpha-3.1\vsprojects\Release
200200
```
201201

202202
Since specifying those properties every build is bothersome, you can instead
203203
create ``<project-root>\gradle.properties`` with contents like:
204204
```
205-
vcProtobufInclude=C:\\path\\to\\protobuf-3.0.0-alpha-3\\src
206-
vcProtobufLibs=C:\\path\\to\\protobuf-3.0.0-alpha-3\\vsprojects\\Release
205+
vcProtobufInclude=C:\\path\\to\\protobuf-3.0.0-alpha-3.1\\src
206+
vcProtobufLibs=C:\\path\\to\\protobuf-3.0.0-alpha-3.1\\vsprojects\\Release
207207
```
208208

209209
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: 4 additions & 0 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: 4 additions & 0 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/ClientStats.java‎

Lines changed: 4 additions & 0 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/ClientStatus.java‎

Lines changed: 4 additions & 0 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/HistogramData.java‎

Lines changed: 4 additions & 0 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/Mark.java‎

Lines changed: 4 additions & 0 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/Payload.java‎

Lines changed: 4 additions & 0 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/ServerArgs.java‎

Lines changed: 4 additions & 0 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/ServerConfig.java‎

Lines changed: 4 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)