Skip to content

Commit

Permalink
Partly revert "okhttp: make okhttp dependencies compile only (grpc#8971
Browse files Browse the repository at this point in the history
…)"

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.
  • Loading branch information
ejona86 committed Mar 31, 2022
1 parent 86e3362 commit 99f78c4
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions okhttp/build.gradle
Expand Up @@ -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"
}
Expand Down

0 comments on commit 99f78c4

Please sign in to comment.