From 0299788807bcd434109d4924a63949cf44781e3a Mon Sep 17 00:00:00 2001
From: Eric Anderson <ejona@google.com>
Date: Fri, 29 Sep 2023 11:30:51 -0700
Subject: [PATCH] util: Make grpc-core an implementation dependency

This prevents grpc-core from being exposed on the classpath when
compiling code using grpc-util.
---
 rls/build.gradle             | 1 +
 services/build.gradle        | 3 ++-
 servlet/build.gradle         | 1 +
 servlet/jakarta/build.gradle | 1 +
 util/build.gradle            | 5 +++--
 5 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/rls/build.gradle b/rls/build.gradle
index b0abb08b4f3..06b7530ea4f 100644
--- a/rls/build.gradle
+++ b/rls/build.gradle
@@ -16,6 +16,7 @@ tasks.named("jar").configure {
 
 dependencies {
     implementation project(':grpc-util'),
+            project(':grpc-core'),
             project(':grpc-protobuf'),
             project(':grpc-stub'),
             libraries.auto.value.annotations,
diff --git a/services/build.gradle b/services/build.gradle
index 3135d9095ea..7bc55fdd97b 100644
--- a/services/build.gradle
+++ b/services/build.gradle
@@ -26,7 +26,8 @@ dependencies {
     api project(':grpc-protobuf'),
             project(':grpc-stub'),
             project(':grpc-util')
-    implementation libraries.protobuf.java.util,
+    implementation project(':grpc-core'),
+            libraries.protobuf.java.util,
             libraries.guava.jre // JRE required by protobuf-java-util
 
     runtimeOnly libraries.errorprone.annotations,
diff --git a/servlet/build.gradle b/servlet/build.gradle
index e293708b6ff..667a0819b75 100644
--- a/servlet/build.gradle
+++ b/servlet/build.gradle
@@ -40,6 +40,7 @@ dependencies {
             libraries.javax.annotation // java 9, 10 needs it
 
     implementation project(':grpc-util'),
+            project(':grpc-core'),
             libraries.guava
 
     testImplementation 'javax.servlet:javax.servlet-api:4.0.1'
diff --git a/servlet/jakarta/build.gradle b/servlet/jakarta/build.gradle
index 82f11938f83..0b5bc0ceffb 100644
--- a/servlet/jakarta/build.gradle
+++ b/servlet/jakarta/build.gradle
@@ -81,6 +81,7 @@ dependencies {
             libraries.javax.annotation
 
     implementation project(':grpc-util'),
+            project(':grpc-core'),
             libraries.guava
 
     itImplementation project(':grpc-servlet-jakarta'),
diff --git a/util/build.gradle b/util/build.gradle
index cdd32e0ceb5..4f966c8a658 100644
--- a/util/build.gradle
+++ b/util/build.gradle
@@ -16,9 +16,10 @@ tasks.named("jar").configure {
 }
 
 dependencies {
-    api project(':grpc-core')
+    api project(':grpc-api')
 
-    implementation libraries.animalsniffer.annotations,
+    implementation project(':grpc-core'),
+            libraries.animalsniffer.annotations,
             libraries.guava
     testImplementation libraries.guava.testlib,
             testFixtures(project(':grpc-api')),