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

build,protobuf: update google_api_protos dependency

This commit is contained in:
Eric Gribkoff 2017-05-01 14:43:53 -07:00 committed by GitHub
parent 8dc29f91bb
commit df69485f44
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -177,7 +177,7 @@ subprojects {
hpack: 'com.twitter:hpack:0.10.1',
jsr305: 'com.google.code.findbugs:jsr305:3.0.0',
oauth_client: 'com.google.auth:google-auth-library-oauth2-http:0.4.0',
google_api_protos: 'com.google.api.grpc:grpc-google-common-protos:0.1.6',
google_api_protos: 'com.google.api.grpc:proto-google-common-protos:0.1.9',
google_auth_credentials: 'com.google.auth:google-auth-library-credentials:0.4.0',
okhttp: 'com.squareup.okhttp:okhttp:2.5.0',
okio: 'com.squareup.okio:okio:1.6.0',

7
protobuf/build.gradle
View File

@ -16,10 +16,9 @@ dependencies {
libraries.protobuf_util
compile (libraries.google_api_protos) {
exclude group: 'io.grpc'
// 'com.google.api' transitively depends on 'com.google.auto.value:auto-value:1.1', which
// breaks our annotations.
exclude group: 'com.google.api'
// 'com.google.api:api-common' transitively depends on auto-value, which breaks our
// annotations.
exclude group: 'com.google.api', module: 'api-common'
}
compile (project(':grpc-protobuf-lite')) {