diff options
| author | Jesse Wilson <jwilson@squareup.com> | 2018-09-20 14:43:54 -0400 |
|---|---|---|
| committer | Eric Anderson <ejona@google.com> | 2018-09-28 13:23:55 -0700 |
| commit | 8b16899bc1f4ffc22b899cea7724cf2eebd348f8 (patch) | |
| tree | bbe3cff7a4faba1ce6c318ee1035921830df3c9e /protobuf | |
| parent | 1f006959b0863bf254495c4d627b4c9abaca41f0 (diff) | |
| download | grpc-grpc-java-8b16899bc1f4ffc22b899cea7724cf2eebd348f8.tar.gz | |
Upgrade to Guava 26.0-android and jsr305 3.0.2
Diffstat (limited to 'protobuf')
| -rw-r--r-- | protobuf/build.gradle | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/protobuf/build.gradle b/protobuf/build.gradle index abb2bc7a8..31f4f3c3d 100644 --- a/protobuf/build.gradle +++ b/protobuf/build.gradle @@ -10,8 +10,15 @@ buildscript { dependencies { compile project(':grpc-core'), - libraries.protobuf, - libraries.guava + libraries.protobuf + compile (libraries.guava) { + // prefer 2.2.0 from libraries instead of 2.1.3 + exclude group: 'com.google.errorprone', module: 'error_prone_annotations' + // prefer 3.0.2 from libraries instead of 3.0.1 + exclude group: 'com.google.code.findbugs', module: 'jsr305' + // prefer 1.17 from libraries instead of 1.14 + exclude group: 'org.codehaus.mojo', module: 'animal-sniffer-annotations' + } compile (libraries.google_api_protos) { // 'com.google.api:api-common' transitively depends on auto-value, which breaks our |