Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
avoid gRPC android guava dep
  • Loading branch information
sfackler committed Feb 26, 2021
commit 1333a52246a8cfbb1a6230373dd68b885b822b74
13 changes: 10 additions & 3 deletions tracing-grpc/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,23 @@ apply plugin: 'com.palantir.revapi'

dependencies {
api project(':tracing')
api 'io.grpc:grpc-api'
api('io.grpc:grpc-api') {
// gRPC pulls in the android version of guava, which we don't want
exclude group: 'com.google.guava', module: 'guava'
}

implementation project(':tracing-api')

testImplementation 'junit:junit'
testImplementation 'org.assertj:assertj-core'
testImplementation 'org.mockito:mockito-core'

testImplementation 'io.grpc:grpc-testing'
testImplementation 'io.grpc:grpc-testing-proto'
testImplementation('io.grpc:grpc-testing') {
exclude group: 'com.google.guava', module: 'guava'
}
testImplementation('io.grpc:grpc-testing-proto') {
exclude group: 'com.google.guava', module: 'guava'
}

compileOnly "org.immutables:value::annotations"
testCompileOnly "org.immutables:value::annotations"
Expand Down
20 changes: 12 additions & 8 deletions versions.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@ com.fasterxml.jackson.core:jackson-core:2.10.4 (16 constraints: fe3a68dc)
com.fasterxml.jackson.core:jackson-databind:2.10.4 (22 constraints: 19998e7a)
com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.10.4 (3 constraints: 4130b135)
com.fasterxml.jackson.module:jackson-module-afterburner:2.10.4 (3 constraints: 4130b135)
com.google.code.findbugs:jsr305:3.0.2 (20 constraints: 8209db7a)
com.google.errorprone:error_prone_annotations:2.4.0 (7 constraints: 424c6ed7)
com.google.code.findbugs:jsr305:3.0.2 (22 constraints: 011f6dfc)
com.google.errorprone:error_prone_annotations:2.4.0 (9 constraints: c361e74c)
com.google.guava:failureaccess:1.0.1 (1 constraints: 140ae1b4)
com.google.guava:guava:30.0-android (10 constraints: f78743bb)
com.google.guava:guava:28.2-jre (6 constraints: 5c5ba522)
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava (1 constraints: bd17c918)
com.google.j2objc:j2objc-annotations:1.3 (1 constraints: b809eda0)
com.palantir.safe-logging:preconditions:1.8.2 (2 constraints: 3c19cfb5)
com.palantir.safe-logging:safe-logging:1.8.2 (3 constraints: 422aeb21)
com.squareup.okhttp3:okhttp:3.9.0 (1 constraints: 0e051536)
com.squareup.okio:okio:1.13.0 (1 constraints: 7f0cb509)
io.grpc:grpc-api:1.35.0 (3 constraints: cc15353c)
io.grpc:grpc-api:1.35.0 (5 constraints: b32bd923)
io.grpc:grpc-context:1.35.0 (2 constraints: 6311050a)
io.undertow:undertow-core:2.0.17.Final (1 constraints: 54072861)
jakarta.annotation:jakarta.annotation-api:1.3.5 (4 constraints: c93b8593)
Expand All @@ -23,8 +23,8 @@ jakarta.validation:jakarta.validation-api:2.0.2 (12 constraints: c9bea393)
jakarta.ws.rs:jakarta.ws.rs-api:2.1.6 (11 constraints: 21bc0ae5)
net.sf.jopt-simple:jopt-simple:4.6 (1 constraints: 610a91b7)
org.apache.commons:commons-math3:3.2 (1 constraints: 5c0a8ab7)
org.checkerframework:checker-compat-qual:2.5.5 (1 constraints: 1e0af9b4)
org.codehaus.mojo:animal-sniffer-annotations:1.19 (4 constraints: 8420abaa)
org.checkerframework:checker-qual:3.4.0 (2 constraints: 411a465e)
org.codehaus.mojo:animal-sniffer-annotations:1.19 (6 constraints: b3359899)
org.glassfish.hk2:osgi-resource-locator:1.0.3 (2 constraints: 7d23b265)
org.glassfish.hk2.external:jakarta.inject:2.6.1 (11 constraints: 6ab14a97)
org.glassfish.jersey.core:jersey-client:2.31 (4 constraints: 78509cb2)
Expand Down Expand Up @@ -55,8 +55,10 @@ com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.10.4 (1 constrain
com.fasterxml.jackson.module:jackson-module-parameter-names:2.10.4 (1 constraints: b10e595e)
com.github.ben-manes.caffeine:caffeine:2.8.4 (4 constraints: 633c8aa1)
com.google.android:annotations:4.1.1.4 (1 constraints: 6e08d68b)
com.google.api.grpc:proto-google-common-protos:2.0.1 (1 constraints: d109cda9)
com.google.code.findbugs:annotations:3.0.1 (1 constraints: 9e0aafc3)
com.google.code.gson:gson:2.8.6 (1 constraints: 16083e7b)
com.google.protobuf:protobuf-java:3.12.0 (1 constraints: 040adeb3)
com.helger:profiler:1.1.1 (1 constraints: e21053b8)
com.palantir.conjure.java.runtime:conjure-java-jackson-serialization:4.19.0 (1 constraints: 4005563b)
com.palantir.safe-logging:preconditions-assertj:1.8.2 (1 constraints: 0d050a36)
Expand Down Expand Up @@ -86,8 +88,11 @@ io.dropwizard.metrics:metrics-jvm:4.1.9 (2 constraints: 341ee147)
io.dropwizard.metrics:metrics-logback:4.1.9 (1 constraints: 860ee64f)
io.dropwizard.metrics:metrics-servlets:4.1.9 (1 constraints: 480d411f)
io.grpc:grpc-core:1.35.0 (1 constraints: 940908a7)
io.grpc:grpc-stub:1.35.0 (1 constraints: 940908a7)
io.grpc:grpc-protobuf:1.35.0 (1 constraints: f50b14f5)
io.grpc:grpc-protobuf-lite:1.35.0 (1 constraints: 070ae3b3)
io.grpc:grpc-stub:1.35.0 (2 constraints: 8815e6f4)
io.grpc:grpc-testing:1.35.0 (1 constraints: 3b05403b)
io.grpc:grpc-testing-proto:1.35.0 (1 constraints: 3b05403b)
io.opencensus:opencensus-api:0.28.0 (1 constraints: 950907a7)
io.perfmark:perfmark-api:0.23.0 (1 constraints: 3b085f83)
io.zipkin.java:zipkin:1.13.1 (1 constraints: 3805333b)
Expand All @@ -105,7 +110,6 @@ org.apache.commons:commons-lang3:3.10 (4 constraints: 4b373a47)
org.apache.commons:commons-text:1.8 (1 constraints: b4102e9b)
org.apiguardian:apiguardian-api:1.1.0 (6 constraints: 7d64a5c6)
org.assertj:assertj-core:3.19.0 (2 constraints: 991997df)
org.checkerframework:checker-qual:3.4.0 (1 constraints: fd0f6a9f)
org.eclipse.jetty:jetty-continuation:9.4.29.v20200521 (1 constraints: d81018f8)
org.eclipse.jetty:jetty-http:9.4.29.v20200521 (4 constraints: 2b459ddb)
org.eclipse.jetty:jetty-io:9.4.29.v20200521 (6 constraints: c5611794)
Expand Down