Directly depend on errorprone when used in the project instead of rel…

…ying on Guava's transitive dep
grpc · Jun 7, 2021 · 1052e18 · 1052e18
1 parent 3da5c42
commit 1052e18
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/api/build.gradle b/api/build.gradle
@@ -13,7 +13,8 @@ evaluationDependsOn(project(':grpc-context').path)
 dependencies {
     api project(':grpc-context'),
             libraries.jsr305
-    implementation libraries.guava
+    implementation libraries.guava,
+            libraries.errorprone
 
     testImplementation project(':grpc-context').sourceSets.test.output,
             project(':grpc-testing'),

diff --git a/examples/pom.xml b/examples/pom.xml
@@ -51,12 +51,6 @@
       <artifactId>protobuf-java-util</artifactId>
       <version>${protobuf.version}</version>
     </dependency>
-    <!-- Override protobuf-java-util's older error prone for requireUpperBoundDeps -->
-    <dependency>
-      <groupId>com.google.errorprone</groupId>
-      <artifactId>error_prone_annotations</artifactId>
-      <version>2.4.0</version>
-    </dependency>
     <dependency>
       <groupId>org.apache.tomcat</groupId>
       <artifactId>annotations-api</artifactId>

diff --git a/netty/build.gradle b/netty/build.gradle
@@ -20,6 +20,7 @@ dependencies {
             libraries.netty
     implementation libraries.netty_proxy_handler,
             libraries.guava,
+            libraries.errorprone,
             libraries.perfmark
 
     // Tests depend on base class defined by core module.