Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions api/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,9 @@ dependencies {
libraries.jsr305,
libraries.animalsniffer_annotations
compile (libraries.guava) {
// prefer 2.3.3 from libraries instead of 2.1.3
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This comment has been outdated; Guava 28.1 uses error_prone_annotations:2.3.2.

// prefer our own versions from libraries instead of Guava's dependency
exclude group: 'com.google.errorprone', module: 'error_prone_annotations'
// prefer 3.0.2 from libraries instead of 3.0.1
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This comment has been outdated; Guava 28.1 uses jsr305:3.0.2.

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'
}

Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ subprojects {

libraries = [
android_annotations: "com.google.android:annotations:4.1.1.4",
animalsniffer_annotations: "org.codehaus.mojo:animal-sniffer-annotations:1.17",
animalsniffer_annotations: "org.codehaus.mojo:animal-sniffer-annotations:1.18",
errorprone: "com.google.errorprone:error_prone_annotations:2.3.3",
gson: "com.google.code.gson:gson:2.8.5",
guava: "com.google.guava:guava:${guavaVersion}",
Expand Down
4 changes: 1 addition & 3 deletions protobuf-lite/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,9 @@ dependencies {
compile project(':grpc-api'),
libraries.protobuf_lite
compile (libraries.guava) {
// prefer 2.3.3 from libraries instead of 2.1.3
// prefer our own versions from libraries instead of Guava's dependency
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'
}

Expand Down
4 changes: 1 addition & 3 deletions protobuf/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,9 @@ dependencies {
compile project(':grpc-api'),
libraries.protobuf
compile (libraries.guava) {
// prefer 2.3.2 from libraries instead of 2.1.3
// prefer our own versions from libraries instead of Guava's dependency
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'
}

Expand Down
4 changes: 2 additions & 2 deletions repositories.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -473,8 +473,8 @@ def org_apache_commons_lang3():
def org_codehaus_mojo_animal_sniffer_annotations():
jvm_maven_import_external(
name = "org_codehaus_mojo_animal_sniffer_annotations",
artifact = "org.codehaus.mojo:animal-sniffer-annotations:1.17",
artifact = "org.codehaus.mojo:animal-sniffer-annotations:1.18",
server_urls = ["http://central.maven.org/maven2"],
artifact_sha256 = "92654f493ecfec52082e76354f0ebf87648dc3d5cec2e3c3cdb947c016747a53",
artifact_sha256 = "47f05852b48ee9baefef80fa3d8cea60efa4753c0013121dd7fe5eef2e5c729d",
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

suztomo-macbookpro44:grpc-java suztomo$ shasum -a 256 ~/Downloads/animal-sniffer-annotations-1.18.jar 
47f05852b48ee9baefef80fa3d8cea60efa4753c0013121dd7fe5eef2e5c729d  /Users/suztomo/Downloads/animal-sniffer-annotations-1.18.jar

licenses = ["notice"], # MIT
)