From 99f78c48b61010653536b333b022e5b2d40cc642 Mon Sep 17 00:00:00 2001
From: Eric Anderson <ejona@google.com>
Date: Thu, 31 Mar 2022 10:30:42 -0700
Subject: [PATCH] Partly revert "okhttp: make okhttp dependencies compile only
 (#8971)"

This partly reverts b20ce178 because it is dependent on cda0e9d which is
being reverted as it is incompatible with Proguard without configuration
(e.g., isAvailable() may not be available and would need a -keep).

While the code no longer uses compileOnly, the compatibility still
remains, so it would be possible for users to exclude the okhttp
dependency if they don't use AndroidChannelBuilder.
---
 okhttp/build.gradle | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/okhttp/build.gradle b/okhttp/build.gradle
index 490e527cbf1..7f8b0a38861 100644
--- a/okhttp/build.gradle
+++ b/okhttp/build.gradle
@@ -11,18 +11,17 @@ description = "gRPC: OkHttp"
 evaluationDependsOn(project(':grpc-core').path)
 
 dependencies {
-    api project(':grpc-core')
+    api project(':grpc-core'),
+            libraries.okhttp
     implementation libraries.okio,
             libraries.guava,
             libraries.perfmark
     // Make okhttp dependencies compile only
-    compileOnly libraries.okhttp
     // Tests depend on base class defined by core module.
     testImplementation project(':grpc-core').sourceSets.test.output,
             project(':grpc-api').sourceSets.test.output,
             project(':grpc-testing'),
-            project(':grpc-netty'),
-            libraries.okhttp
+            project(':grpc-netty')
     signature "org.codehaus.mojo.signature:java17:1.0@signature"
     signature "net.sf.androidscents.signature:android-api-level-14:4.0_r4@signature"
 }