diff options
-rw-r--r-- | alts/build.gradle | 2 | ||||
-rw-r--r-- | build.gradle | 6 | ||||
-rw-r--r-- | core/build.gradle | 13 | ||||
-rw-r--r-- | protobuf-lite/build.gradle | 11 | ||||
-rw-r--r-- | protobuf-nano/build.gradle | 11 | ||||
-rw-r--r-- | protobuf/build.gradle | 11 | ||||
-rw-r--r-- | repositories.bzl | 8 |
7 files changed, 45 insertions, 17 deletions
diff --git a/alts/build.gradle b/alts/build.gradle index 5a8c9e376..e22e0555d 100644 --- a/alts/build.gradle +++ b/alts/build.gradle @@ -27,7 +27,7 @@ dependencies { libraries.lang, libraries.protobuf compile (libraries.google_auth_oauth2_http) { - // prefer 3.0.0 from libraries instead of 1.3.9 + // prefer 3.0.2 from libraries instead of 1.3.9 exclude group: 'com.google.code.findbugs', module: 'jsr305' // prefer 20.0 from libraries instead of 19.0 exclude group: 'com.google.guava', module: 'guava' diff --git a/build.gradle b/build.gradle index 2297beda0..17ceba16d 100644 --- a/build.gradle +++ b/build.gradle @@ -111,7 +111,7 @@ subprojects { javaPluginPath = "$rootDir/compiler/build/exe/java_plugin/$protocPluginBaseName$exeSuffix" nettyVersion = '4.1.27.Final' - guavaVersion = '20.0' + guavaVersion = '26.0-android' protobufVersion = '3.5.1' protocVersion = '3.5.1-1' protobufNanoVersion = '3.0.0-alpha-5' @@ -201,7 +201,7 @@ subprojects { guava: "com.google.guava:guava:${guavaVersion}", hpack: 'com.twitter:hpack:0.10.1', javax_annotation: 'javax.annotation:javax.annotation-api:1.2', - jsr305: 'com.google.code.findbugs:jsr305:3.0.0', + jsr305: 'com.google.code.findbugs:jsr305:3.0.2', oauth_client: 'com.google.auth:google-auth-library-oauth2-http:0.9.0', google_api_protos: 'com.google.api.grpc:proto-google-common-protos:1.0.0', google_auth_credentials: 'com.google.auth:google-auth-library-credentials:0.9.0', @@ -233,7 +233,7 @@ subprojects { junit: 'junit:junit:4.12', mockito: 'org.mockito:mockito-core:1.9.5', truth: 'com.google.truth:truth:0.42', - guava_testlib: 'com.google.guava:guava-testlib:20.0', + guava_testlib: "com.google.guava:guava-testlib:${guavaVersion}", // Benchmark dependencies hdrhistogram: 'org.hdrhistogram:HdrHistogram:2.1.10', diff --git a/core/build.gradle b/core/build.gradle index 700592f86..4a2429098 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -3,12 +3,19 @@ description = 'gRPC: Core' dependencies { compile project(':grpc-context'), libraries.gson, - libraries.guava, libraries.errorprone, libraries.jsr305, libraries.animalsniffer_annotations + 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.opencensus_api) { - // prefer 3.0.0 from libraries instead of 3.0.1 + // prefer 3.0.2 from libraries instead of 3.0.1 exclude group: 'com.google.code.findbugs', module: 'jsr305' // prefer 20.0 from libraries instead of 19.0 exclude group: 'com.google.guava', module: 'guava' @@ -16,7 +23,7 @@ dependencies { exclude group: 'io.grpc', module: 'grpc-context' } compile (libraries.opencensus_contrib_grpc_metrics) { - // prefer 3.0.0 from libraries instead of 3.0.1 + // prefer 3.0.2 from libraries instead of 3.0.1 exclude group: 'com.google.code.findbugs', module: 'jsr305' // we'll always be more up-to-date exclude group: 'io.grpc', module: 'grpc-context' diff --git a/protobuf-lite/build.gradle b/protobuf-lite/build.gradle index ead5180b5..0cd67a923 100644 --- a/protobuf-lite/build.gradle +++ b/protobuf-lite/build.gradle @@ -13,8 +13,15 @@ description = 'gRPC: Protobuf Lite' dependencies { compile project(':grpc-core'), - libraries.protobuf_lite, - libraries.guava + libraries.protobuf_lite + 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' + } testProtobuf libraries.protobuf diff --git a/protobuf-nano/build.gradle b/protobuf-nano/build.gradle index dd26db4e7..aae0a7957 100644 --- a/protobuf-nano/build.gradle +++ b/protobuf-nano/build.gradle @@ -11,8 +11,15 @@ description = 'gRPC: Protobuf Nano' dependencies { compile project(':grpc-core'), - libraries.protobuf_nano, - libraries.guava + libraries.protobuf_nano + 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' + } signature "org.codehaus.mojo.signature:java17:1.0@signature" signature "net.sf.androidscents.signature:android-api-level-14:4.0_r4@signature" } 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 diff --git a/repositories.bzl b/repositories.bzl index c3bbdfd52..310be7400 100644 --- a/repositories.bzl +++ b/repositories.bzl @@ -132,8 +132,8 @@ def com_google_auth_google_auth_library_oauth2_http(): def com_google_code_findbugs_jsr305(): native.maven_jar( name = "com_google_code_findbugs_jsr305", - artifact = "com.google.code.findbugs:jsr305:3.0.0", - sha1 = "5871fb60dc68d67da54a663c3fd636a10a532948", + artifact = "com.google.code.findbugs:jsr305:3.0.2", + sha1 = "25ea2e8b0c338a877313bd4672d3fe056ea78f0d", ) def com_google_code_gson(): @@ -153,8 +153,8 @@ def com_google_errorprone_error_prone_annotations(): def com_google_guava(): native.maven_jar( name = "com_google_guava_guava", - artifact = "com.google.guava:guava:20.0", - sha1 = "89507701249388e1ed5ddcf8c41f4ce1be7831ef", + artifact = "com.google.guava:guava:26.0-android", + sha1 = "ef69663836b339db335fde0df06fb3cd84e3742b", ) def com_google_protobuf(): |