grpc
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use protoc from Maven Central.

This commit is contained in:
Kun Zhang 2015-05-06 16:44:55 -07:00
parent 86207752b7
commit c5b94c7525
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build.gradle
View File

@ -39,12 +39,14 @@ subprojects {
} }
ext { ext {
protobufVersion = '3.0.0-alpha-2'
configureProtoCompilation = { configureProtoCompilation = {
if (rootProject.childProjects.containsKey('grpc-compiler')) { if (rootProject.childProjects.containsKey('grpc-compiler')) {
// Only when the codegen is built along with the project, will we be able to recompile // Only when the codegen is built along with the project, will we be able to recompile
// the proto files. // the proto files.
project.apply plugin: 'com.google.protobuf' project.apply plugin: 'com.google.protobuf'
project.protobufCodeGenPlugins = ["java_plugin:$javaPluginPath"] project.protobufCodeGenPlugins = ["java_plugin:$javaPluginPath"]
project.protocDep = "com.google.protobuf:protoc:${protobufVersion}"
project.generatedFileDir = "${projectDir}/src/generated" project.generatedFileDir = "${projectDir}/src/generated"
project.afterEvaluate { project.afterEvaluate {
generateProto.dependsOn ':grpc-compiler:java_pluginExecutable' generateProto.dependsOn ':grpc-compiler:java_pluginExecutable'
@ -71,8 +73,8 @@ subprojects {
jsr305: 'com.google.code.findbugs:jsr305:3.0.0', jsr305: 'com.google.code.findbugs:jsr305:3.0.0',
oauth_client: 'com.google.auth:google-auth-library-oauth2-http:0.1.0', oauth_client: 'com.google.auth:google-auth-library-oauth2-http:0.1.0',
okhttp: 'com.squareup.okhttp:okhttp:2.2.0', okhttp: 'com.squareup.okhttp:okhttp:2.2.0',
protobuf: 'com.google.protobuf:protobuf-java:3.0.0-alpha-2', protobuf: "com.google.protobuf:protobuf-java:${protobufVersion}",
protobuf_nano: 'com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-2', protobuf_nano: "com.google.protobuf.nano:protobuf-javanano:${protobufVersion}",
protobuf_plugin: 'com.google.protobuf:protobuf-gradle-plugin:0.3.1', protobuf_plugin: 'com.google.protobuf:protobuf-gradle-plugin:0.3.1',
// TODO: Unreleased dependencies. // TODO: Unreleased dependencies.

1
compiler/build.gradle
View File

@ -153,6 +153,7 @@ artifacts {
} }
} }
project.protocDep = "com.google.protobuf:protoc:${protobufVersion}"
protobufCodeGenPlugins = ["java_plugin:$javaPluginPath"] protobufCodeGenPlugins = ["java_plugin:$javaPluginPath"]
project.afterEvaluate { project.afterEvaluate {