Skip to content

Commit 99f78c4

Browse files
committed
Partly revert "okhttp: make okhttp dependencies compile only (grpc#8971)"
This partly reverts b20ce17 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.
1 parent 86e3362 commit 99f78c4

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

okhttp/build.gradle

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,17 @@ description = "gRPC: OkHttp"
1111
evaluationDependsOn(project(':grpc-core').path)
1212

1313
dependencies {
14-
api project(':grpc-core')
14+
api project(':grpc-core'),
15+
libraries.okhttp
1516
implementation libraries.okio,
1617
libraries.guava,
1718
libraries.perfmark
1819
// Make okhttp dependencies compile only
19-
compileOnly libraries.okhttp
2020
// Tests depend on base class defined by core module.
2121
testImplementation project(':grpc-core').sourceSets.test.output,
2222
project(':grpc-api').sourceSets.test.output,
2323
project(':grpc-testing'),
24-
project(':grpc-netty'),
25-
libraries.okhttp
24+
project(':grpc-netty')
2625
signature "org.codehaus.mojo.signature:java17:1.0@signature"
2726
signature "net.sf.androidscents.signature:android-api-level-14:4.0_r4@signature"
2827
}

0 commit comments

Comments
 (0)