From 3f60746a986af1ad0d0a4e295ce2a73afdc55d32 Mon Sep 17 00:00:00 2001 From: Eric Anderson Date: Thu, 20 Jul 2023 07:57:11 -0700 Subject: [PATCH] servlet: Remove unused dependency on grpc-util in tests Also convert to testFixtures, like we did elsewhere. grpc-testing had previously been listed, but because of the missing comma, it was not an actual dependency. --- servlet/build.gradle | 9 +++++---- servlet/jakarta/build.gradle | 3 +-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/servlet/build.gradle b/servlet/build.gradle index f5b93432a2..582e99a361 100644 --- a/servlet/build.gradle +++ b/servlet/build.gradle @@ -42,8 +42,7 @@ dependencies { itImplementation project(':grpc-servlet'), project(':grpc-netty'), - project(':grpc-core').sourceSets.test.runtimeClasspath, - project(':grpc-util').sourceSets.test.runtimeClasspath, + testFixtures(project(':grpc-core')), libraries.junit itImplementation(project(':grpc-interop-testing')) { // Avoid grpc-netty-shaded dependency @@ -57,8 +56,10 @@ dependencies { jettyTestImplementation "org.eclipse.jetty:jetty-servlet:${jettyVersion}", "org.eclipse.jetty.http2:http2-server:${jettyVersion}", - "org.eclipse.jetty:jetty-client:${jettyVersion}" - project(':grpc-testing') + "org.eclipse.jetty:jetty-client:${jettyVersion}", + project(':grpc-testing'), + libraries.truth, + libraries.protobuf.java } test { diff --git a/servlet/jakarta/build.gradle b/servlet/jakarta/build.gradle index 264a47c426..782c24557b 100644 --- a/servlet/jakarta/build.gradle +++ b/servlet/jakarta/build.gradle @@ -79,8 +79,7 @@ dependencies { itImplementation project(':grpc-servlet-jakarta'), project(':grpc-netty'), - project(':grpc-core').sourceSets.test.runtimeClasspath, - project(':grpc-util').sourceSets.test.runtimeClasspath, + testFixtures(project(':grpc-core')), libraries.junit itImplementation(project(':grpc-interop-testing')) { // Avoid grpc-netty-shaded dependency