Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
deps: update dependency com.google.guava:guava-bom to v28.2-android (#76
)

* deps: update dependency com.google.guava:guava-bom to v28.2-android

* build: add exclusion of error_prone_annotations to grpc-api usage

Fixes #33

Co-authored-by: WhiteSource Renovate <renovatebot@gmail.com>
  • Loading branch information
BenWhitehead and renovate-bot committed Jan 9, 2020
1 parent 2f3a14b commit c1dcb9f
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 17 deletions.
8 changes: 4 additions & 4 deletions google-cloud-firestore/pom.xml
Expand Up @@ -93,11 +93,11 @@
<groupId>io.grpc</groupId>
<artifactId>grpc-api</artifactId>
<exclusions>
<!-- currently collides with animal-sniffer-annotations from guava -->
<!-- TODO(#33) try to remove after the next bump of guava -->
<!-- currently collides with error_prone_annotations from grpc -->
<!-- TODO try to remove after the next bump of grpc -->
<exclusion>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-annotations</artifactId>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_annotations</artifactId>
</exclusion>
</exclusions>
</dependency>
Expand Down
8 changes: 4 additions & 4 deletions grpc-google-cloud-firestore-admin-v1/pom.xml
Expand Up @@ -36,11 +36,11 @@
<groupId>io.grpc</groupId>
<artifactId>grpc-api</artifactId>
<exclusions>
<!-- currently collides with animal-sniffer-annotations from guava -->
<!-- TODO(#33) try to remove after the next bump of guava -->
<!-- currently collides with error_prone_annotations from grpc -->
<!-- TODO try to remove after the next bump of grpc -->
<exclusion>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-annotations</artifactId>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_annotations</artifactId>
</exclusion>
</exclusions>
</dependency>
Expand Down
8 changes: 4 additions & 4 deletions grpc-google-cloud-firestore-v1/pom.xml
Expand Up @@ -32,11 +32,11 @@
<groupId>io.grpc</groupId>
<artifactId>grpc-api</artifactId>
<exclusions>
<!-- currently collides with animal-sniffer-annotations from guava -->
<!-- TODO(#33) try to remove after the next bump of guava -->
<!-- currently collides with error_prone_annotations from grpc -->
<!-- TODO try to remove after the next bump of grpc -->
<exclusion>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-annotations</artifactId>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_annotations</artifactId>
</exclusion>
</exclusions>
</dependency>
Expand Down
8 changes: 4 additions & 4 deletions grpc-google-cloud-firestore-v1beta1/pom.xml
Expand Up @@ -32,11 +32,11 @@
<groupId>io.grpc</groupId>
<artifactId>grpc-api</artifactId>
<exclusions>
<!-- currently collides with animal-sniffer-annotations from guava -->
<!-- TODO(#33) try to remove after the next bump of guava -->
<!-- currently collides with error_prone_annotations from grpc -->
<!-- TODO try to remove after the next bump of grpc -->
<exclusion>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-annotations</artifactId>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_annotations</artifactId>
</exclusion>
</exclusions>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Expand Up @@ -159,7 +159,7 @@
<grpc.version>1.26.0</grpc.version>
<protobuf.version>3.11.1</protobuf.version>
<junit.version>4.13</junit.version>
<guava.version>28.1-android</guava.version>
<guava.version>28.2-android</guava.version>
<threeten.version>1.4.0</threeten.version>
<opencensus.version>0.24.0</opencensus.version>
<mockito.version>1.10.19</mockito.version>
Expand Down

0 comments on commit c1dcb9f

Please sign in to comment.