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

Upgrade Guava to 26.0-android 

This reverts commit 4adcf24363. The downgrade of
Guava has gone out in a release, so we can upgrade it again in the next
release.
This commit is contained in:
Eric Anderson 2019-02-01 06:52:10 -08:00
parent 723851627e
commit ddb16c5b4b
7 changed files with 19 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
alts/build.gradle
View File

@ -29,7 +29,7 @@ dependencies {
compile (libraries.google_auth_oauth2_http) {
// prefer 3.0.2 from libraries instead of 1.3.9
exclude group: 'com.google.code.findbugs', module: 'jsr305'
// prefer 25.1 from libraries instead of 19.0
// prefer 20.0 from libraries instead of 19.0
exclude group: 'com.google.guava', module: 'guava'
}
compileOnly libraries.javax_annotation

5
build.gradle
View File

@ -109,9 +109,7 @@ subprojects {
nettyVersion = '4.1.32.Final'
googleauthVersion = '0.9.0'
// Temporarily use a slightly older version of Guava. Will want to bump
// to 27.0.1+ with grpc 1.19 or 1.20 for the listenablefuture dep changes.
guavaVersion = '25.1-android'
guavaVersion = '26.0-android'
protobufVersion = '3.5.1'
protocVersion = '3.5.1-1'
protobufNanoVersion = '3.0.0-alpha-5'
@ -196,7 +194,6 @@ subprojects {
}
libraries = [
animalsniffer_annotations: "org.codehaus.mojo:animal-sniffer-annotations:1.17",
checker_compat_qual: "org.checkerframework:checker-compat-qual:2.5.2",
errorprone: "com.google.errorprone:error_prone_annotations:2.2.0",
gson: "com.google.code.gson:gson:2.7",
guava: "com.google.guava:guava:${guavaVersion}",

14
core/build.gradle
View File

@ -6,24 +6,28 @@ dependencies {
libraries.errorprone,
libraries.jsr305,
libraries.animalsniffer_annotations
// Brought in by Guava, but Proguard fails with 2.0.0. So we bump it to 2.5.2
compile libraries.checker_compat_qual
compile (libraries.guava) {
// prefer 2.2.0 from libraries instead of 2.1.3
exclude group: 'com.google.errorprone', module: 'error_prone_annotations'
// prefer 2.5.2 from libraries instead of 2.0.0
exclude group: 'org.checkerframework', module: 'checker-compat-qual'
// 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.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'
// we'll always be more up-to-date
exclude group: 'io.grpc', module: 'grpc-context'
}
compile (libraries.opencensus_contrib_grpc_metrics) {
// 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'
// prefer 25.1 from libraries instead of 20.0
// prefer 20.0 from libraries instead of 19.0
exclude group: 'com.google.guava', module: 'guava'
}

6
protobuf-lite/build.gradle
View File

@ -14,13 +14,11 @@ description = 'gRPC: Protobuf Lite'
dependencies {
compile project(':grpc-core'),
libraries.protobuf_lite
// Brought in by Guava, but Proguard fails with 2.0.0. So we bump it to 2.5.2
compile libraries.checker_compat_qual
compile (libraries.guava) {
// prefer 2.2.0 from libraries instead of 2.1.3
exclude group: 'com.google.errorprone', module: 'error_prone_annotations'
// prefer 2.5.2 from libraries instead of 2.0.0
exclude group: 'org.checkerframework', module: 'checker-compat-qual'
// 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'
}

6
protobuf-nano/build.gradle
View File

@ -12,13 +12,11 @@ description = 'gRPC: Protobuf Nano'
dependencies {
compile project(':grpc-core'),
libraries.protobuf_nano
// Brought in by Guava, but Proguard fails with 2.0.0. So we bump it to 2.5.2
compile libraries.checker_compat_qual
compile (libraries.guava) {
// prefer 2.2.0 from libraries instead of 2.1.3
exclude group: 'com.google.errorprone', module: 'error_prone_annotations'
// prefer 2.5.2 from libraries instead of 2.0.0
exclude group: 'org.checkerframework', module: 'checker-compat-qual'
// 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'
}

6
protobuf/build.gradle
View File

@ -11,13 +11,11 @@ buildscript {
dependencies {
compile project(':grpc-core'),
libraries.protobuf
// Brought in by Guava, but Proguard fails with 2.0.0. So we bump it to 2.5.2
compile libraries.checker_compat_qual
compile (libraries.guava) {
// prefer 2.2.0 from libraries instead of 2.1.3
exclude group: 'com.google.errorprone', module: 'error_prone_annotations'
// prefer 2.5.2 from libraries instead of 2.0.0
exclude group: 'org.checkerframework', module: 'checker-compat-qual'
// 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'
}

4
repositories.bzl
View File

@ -158,8 +158,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:25.1-android",
sha1 = "bdaab946ca5ad20253502d873ba0c3313d141036",
artifact = "com.google.guava:guava:26.0-android",
sha1 = "ef69663836b339db335fde0df06fb3cd84e3742b",
)
def com_google_j2objc_j2objc_annotations():