From 936c9a83e562184793a1ac52ae74acc776fe4ccc Mon Sep 17 00:00:00 2001 From: Sanjay Pujare Date: Tue, 18 Jul 2023 11:43:10 -0700 Subject: [PATCH] core, services, util: export util from core and move gson dep to services for the checkUpperBoundDeps error --- core/BUILD.bazel | 2 +- services/build.gradle | 4 ++-- util/build.gradle | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/core/BUILD.bazel b/core/BUILD.bazel index a4c1b29612e..ebe5b64c277 100644 --- a/core/BUILD.bazel +++ b/core/BUILD.bazel @@ -49,6 +49,6 @@ java_library( exports = [ ":internal", "//api", - "//inprocess", + "//util", ], ) diff --git a/services/build.gradle b/services/build.gradle index 73cb90d1843..57e33192000 100644 --- a/services/build.gradle +++ b/services/build.gradle @@ -24,8 +24,8 @@ dependencies { libraries.guava.jre // JRE required by protobuf-java-util runtimeOnly libraries.errorprone.annotations, - libraries.j2objc.annotations // Explicit dependency to keep in step with version used by guava - + libraries.j2objc.annotations, // Explicit dependency to keep in step with version used by guava + libraries.gson // to fix checkUpperBoundDeps error here compileOnly libraries.javax.annotation testImplementation project(':grpc-testing'), libraries.netty.transport.epoll, // for DomainSocketAddress diff --git a/util/build.gradle b/util/build.gradle index ffc3e80fbe8..b1babf60b34 100644 --- a/util/build.gradle +++ b/util/build.gradle @@ -13,7 +13,6 @@ dependencies { implementation libraries.animalsniffer.annotations, libraries.guava - runtimeOnly libraries.gson // to fix checkUpperBoundDeps error in services testImplementation testFixtures(project(':grpc-api')), testFixtures(project(':grpc-core')), project(':grpc-testing')