Remove unneeded dependency excludes

Since 44847bf4e, when we upgraded our JUnit version, the JUnit
exclusions have probably not been necessary. e0ac97c4f upgraded
Robolectric to a version that had the auto.service problem fixed.
This commit is contained in:
Eric Anderson 2023-06-23 07:55:20 -07:00
parent 0e6c01837c
commit f46793e82d
10 changed files with 12 additions and 40 deletions

View File

@ -33,9 +33,7 @@ dependencies {
libraries.mockito.core, libraries.mockito.core,
libraries.truth libraries.truth
testImplementation (libraries.guava.testlib) { testImplementation libraries.guava.testlib
exclude group: 'junit', module: 'junit'
}
testRuntimeOnly libraries.netty.tcnative, testRuntimeOnly libraries.netty.tcnative,
libraries.netty.tcnative.classes libraries.netty.tcnative.classes
testRuntimeOnly (libraries.netty.transport.epoll) { testRuntimeOnly (libraries.netty.transport.epoll) {

View File

@ -41,10 +41,7 @@ dependencies {
testImplementation project('::grpc-okhttp') testImplementation project('::grpc-okhttp')
testImplementation libraries.androidx.test.core testImplementation libraries.androidx.test.core
testImplementation libraries.junit testImplementation libraries.junit
testImplementation (libraries.robolectric) { testImplementation libraries.robolectric
// Unreleased change: https://github.com/robolectric/robolectric/pull/5432
exclude group: 'com.google.auto.service', module: 'auto-service'
}
testImplementation libraries.truth testImplementation libraries.truth
} }

View File

@ -21,9 +21,7 @@ dependencies {
testImplementation testFixtures(project(':grpc-context')), testImplementation testFixtures(project(':grpc-context')),
project(':grpc-testing'), project(':grpc-testing'),
project(':grpc-grpclb') project(':grpc-grpclb')
testImplementation (libraries.guava.testlib) { testImplementation libraries.guava.testlib
exclude group: 'junit', module: 'junit'
}
jmh project(':grpc-core') jmh project(':grpc-core')
signature libraries.signature.java signature libraries.signature.java

View File

@ -20,9 +20,7 @@ dependencies {
testImplementation project(':grpc-testing'), testImplementation project(':grpc-testing'),
project(':grpc-testing-proto'), project(':grpc-testing-proto'),
testFixtures(project(':grpc-core')) testFixtures(project(':grpc-core'))
testImplementation (libraries.guava.testlib) { testImplementation libraries.guava.testlib
exclude group: 'junit', module: 'junit'
}
def xdsDependency = implementation project(':grpc-xds') def xdsDependency = implementation project(':grpc-xds')
shadow configurations.implementation.getDependencies().minus([xdsDependency]) shadow configurations.implementation.getDependencies().minus([xdsDependency])

View File

@ -47,13 +47,8 @@ dependencies {
testImplementation libraries.androidx.lifecycle.service testImplementation libraries.androidx.lifecycle.service
testImplementation libraries.junit testImplementation libraries.junit
testImplementation libraries.mockito.core testImplementation libraries.mockito.core
testImplementation (libraries.robolectric) { testImplementation libraries.robolectric
// Unreleased change: https://github.com/robolectric/robolectric/pull/5432 testImplementation libraries.guava.testlib
exclude group: 'com.google.auto.service', module: 'auto-service'
}
testImplementation (libraries.guava.testlib) {
exclude group: 'junit', module: 'junit'
}
testImplementation libraries.truth testImplementation libraries.truth
testImplementation project(':grpc-testing') testImplementation project(':grpc-testing')
testImplementation testFixtures(project(':grpc-core')) testImplementation testFixtures(project(':grpc-core'))
@ -70,9 +65,7 @@ dependencies {
androidTestImplementation libraries.truth androidTestImplementation libraries.truth
androidTestImplementation libraries.mockito.android androidTestImplementation libraries.mockito.android
androidTestImplementation libraries.androidx.lifecycle.service androidTestImplementation libraries.androidx.lifecycle.service
androidTestImplementation (libraries.guava.testlib) { androidTestImplementation libraries.guava.testlib
exclude group: 'junit', module: 'junit'
}
androidTestImplementation testFixtures(project(':grpc-core')) androidTestImplementation testFixtures(project(':grpc-core'))
} }

View File

@ -22,9 +22,7 @@ dependencies {
// Explicitly choose the guava version to stay Java 7-compatible. The rest of gRPC can move // Explicitly choose the guava version to stay Java 7-compatible. The rest of gRPC can move
// forward to Java 8-requiring versions. This is also only used for testing, so is unlikely to // forward to Java 8-requiring versions. This is also only used for testing, so is unlikely to
// cause problems. // cause problems.
testImplementation ('com.google.guava:guava-testlib:30.1.1-android') { testImplementation 'com.google.guava:guava-testlib:30.1.1-android'
exclude group: 'junit', module: 'junit'
}
signature "org.codehaus.mojo.signature:java17:1.0@signature" signature "org.codehaus.mojo.signature:java17:1.0@signature"
signature "net.sf.androidscents.signature:android-api-level-14:4.0_r4@signature" signature "net.sf.androidscents.signature:android-api-level-14:4.0_r4@signature"
} }

View File

@ -37,9 +37,7 @@ dependencies {
testFixtures(project(':grpc-api')), testFixtures(project(':grpc-api')),
project(':grpc-testing'), project(':grpc-testing'),
project(':grpc-grpclb') project(':grpc-grpclb')
testImplementation (libraries.guava.testlib) { testImplementation libraries.guava.testlib
exclude group: 'junit', module: 'junit'
}
testRuntimeOnly project(':grpc-census') testRuntimeOnly project(':grpc-census')

View File

@ -52,10 +52,7 @@ dependencies {
testImplementation libraries.junit testImplementation libraries.junit
testImplementation libraries.mockito.core testImplementation libraries.mockito.core
testImplementation (libraries.robolectric) { testImplementation libraries.robolectric
// Unreleased change: https://github.com/robolectric/robolectric/pull/5432
exclude group: 'com.google.auto.service', module: 'auto-service'
}
} }
task javadocs(type: Javadoc) { task javadocs(type: Javadoc) {

View File

@ -16,10 +16,7 @@ dependencies {
compileOnly libraries.opencensus.api compileOnly libraries.opencensus.api
runtimeOnly project(":grpc-context") // Pull in newer version than census-api runtimeOnly project(":grpc-context") // Pull in newer version than census-api
testImplementation (libraries.mockito.core) { testImplementation libraries.mockito.core
// prefer our own versions instead of mockito's dependency
exclude group: 'org.hamcrest', module: 'hamcrest-core'
}
testImplementation project(':grpc-testing-proto'), testImplementation project(':grpc-testing-proto'),
testFixtures(project(':grpc-core')) testFixtures(project(':grpc-core'))

View File

@ -68,9 +68,7 @@ dependencies {
classifier = "linux-x86_64" classifier = "linux-x86_64"
} }
} }
testImplementation (libraries.guava.testlib) { testImplementation libraries.guava.testlib
exclude group: 'junit', module: 'junit'
}
shadow configurations.implementation.getDependencies().minus([nettyDependency]) shadow configurations.implementation.getDependencies().minus([nettyDependency])
shadow project(path: ':grpc-netty-shaded', configuration: 'shadow') shadow project(path: ':grpc-netty-shaded', configuration: 'shadow')