diff --git a/alts/build.gradle b/alts/build.gradle index 906c0c7168..187100698c 100644 --- a/alts/build.gradle +++ b/alts/build.gradle @@ -10,8 +10,9 @@ plugins { description = "gRPC: ALTS" dependencies { - api project(':grpc-core') + api project(':grpc-api') implementation project(':grpc-auth'), + project(':grpc-core'), project(':grpc-grpclb'), project(':grpc-protobuf'), project(':grpc-stub'), @@ -27,6 +28,7 @@ dependencies { testImplementation project(':grpc-testing'), testFixtures(project(':grpc-core')), + project(':grpc-inprocess'), project(':grpc-testing-proto'), libraries.guava, libraries.junit, diff --git a/android-interop-testing/build.gradle b/android-interop-testing/build.gradle index 323a8b6753..4d96adbd0d 100644 --- a/android-interop-testing/build.gradle +++ b/android-interop-testing/build.gradle @@ -68,6 +68,7 @@ dependencies { implementation 'com.google.android.gms:play-services-base:18.0.1' implementation project(':grpc-android'), + project(':grpc-core'), project(':grpc-auth'), project(':grpc-census'), project(':grpc-okhttp'), diff --git a/android/build.gradle b/android/build.gradle index f1f9afd123..3b3bfa59b9 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -35,7 +35,8 @@ repositories { } dependencies { - api project(':grpc-core') + api project(':grpc-api') + implementation project(':grpc-core') implementation libraries.guava testImplementation project('::grpc-okhttp') testImplementation libraries.androidx.test.core diff --git a/api/build.gradle b/api/build.gradle index 0b240c8f00..0a80a1e48b 100644 --- a/api/build.gradle +++ b/api/build.gradle @@ -44,6 +44,7 @@ dependencies { testFixturesImplementation libraries.guava, libraries.junit, libraries.mockito.core + testImplementation project(':grpc-core') testImplementation project(':grpc-testing') testImplementation libraries.guava.testlib diff --git a/auth/build.gradle b/auth/build.gradle index 3e9646533e..093c798fa7 100644 --- a/auth/build.gradle +++ b/auth/build.gradle @@ -19,6 +19,7 @@ dependencies { libraries.google.auth.credentials implementation libraries.guava testImplementation project(':grpc-testing'), + project(':grpc-core'), libraries.google.auth.oauth2Http signature libraries.signature.java signature libraries.signature.android diff --git a/benchmarks/build.gradle b/benchmarks/build.gradle index 49871e28aa..aec3515058 100644 --- a/benchmarks/build.gradle +++ b/benchmarks/build.gradle @@ -26,6 +26,7 @@ tasks.named("jar").configure { dependencies { implementation project(':grpc-core'), + project(':grpc-inprocess'), project(':grpc-netty'), project(':grpc-okhttp'), project(':grpc-stub'), diff --git a/binder/build.gradle b/binder/build.gradle index 673d517387..5b593bfe5f 100644 --- a/binder/build.gradle +++ b/binder/build.gradle @@ -35,8 +35,9 @@ repositories { } dependencies { - api project(':grpc-core') + api project(':grpc-api') + implementation project(':grpc-core') implementation libraries.androidx.annotation implementation libraries.androidx.core implementation libraries.androidx.lifecycle.common @@ -51,6 +52,7 @@ dependencies { testImplementation libraries.guava.testlib testImplementation libraries.truth testImplementation project(':grpc-testing') + testImplementation project(':grpc-inprocess') testImplementation testFixtures(project(':grpc-core')) androidTestAnnotationProcessor libraries.auto.value diff --git a/core/build.gradle b/core/build.gradle index 31c4a222ad..3d5e20ad3c 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -33,6 +33,7 @@ dependencies { libraries.truth, project(':grpc-testing') testImplementation testFixtures(project(':grpc-api')), + project(':grpc-inprocess'), project(':grpc-testing') testImplementation libraries.guava.testlib diff --git a/cronet/build.gradle b/cronet/build.gradle index d842c52940..3252a9d249 100644 --- a/cronet/build.gradle +++ b/cronet/build.gradle @@ -43,8 +43,9 @@ android { } dependencies { - api project(':grpc-core'), + api project(':grpc-api'), libraries.cronet.api + implementation project(':grpc-core') implementation libraries.guava testImplementation project(':grpc-testing') diff --git a/examples/build.gradle b/examples/build.gradle index 7be82fd701..19fe3c72f1 100644 --- a/examples/build.gradle +++ b/examples/build.gradle @@ -39,6 +39,7 @@ dependencies { runtimeOnly "io.grpc:grpc-netty-shaded:${grpcVersion}" testImplementation "io.grpc:grpc-testing:${grpcVersion}" + testImplementation "io.grpc:grpc-inprocess:${grpcVersion}" testImplementation "junit:junit:4.13.2" testImplementation "org.mockito:mockito-core:4.4.0" } diff --git a/examples/example-hostname/build.gradle b/examples/example-hostname/build.gradle index 48c440cdff..756f0a95ba 100644 --- a/examples/example-hostname/build.gradle +++ b/examples/example-hostname/build.gradle @@ -35,6 +35,7 @@ dependencies { testImplementation 'junit:junit:4.13.2' testImplementation "io.grpc:grpc-testing:${grpcVersion}" + testImplementation "io.grpc:grpc-inprocess:${grpcVersion}" } protobuf { diff --git a/examples/example-jwt-auth/build.gradle b/examples/example-jwt-auth/build.gradle index ffe38321c7..242f8f607c 100644 --- a/examples/example-jwt-auth/build.gradle +++ b/examples/example-jwt-auth/build.gradle @@ -38,6 +38,7 @@ dependencies { runtimeOnly "io.grpc:grpc-netty-shaded:${grpcVersion}" testImplementation "io.grpc:grpc-testing:${grpcVersion}" + testImplementation "io.grpc:grpc-inprocess:${grpcVersion}" testImplementation "junit:junit:4.13.2" testImplementation "org.mockito:mockito-core:4.4.0" } diff --git a/examples/example-oauth/build.gradle b/examples/example-oauth/build.gradle index 1c075e44f6..a95c9632a2 100644 --- a/examples/example-oauth/build.gradle +++ b/examples/example-oauth/build.gradle @@ -38,6 +38,7 @@ dependencies { runtimeOnly "io.grpc:grpc-netty-shaded:${grpcVersion}" testImplementation "io.grpc:grpc-testing:${grpcVersion}" + testImplementation "io.grpc:grpc-inprocess:${grpcVersion}" testImplementation "junit:junit:4.13.2" testImplementation "org.mockito:mockito-core:4.4.0" } diff --git a/inprocess/build.gradle b/inprocess/build.gradle index 11a2be722c..edc97883b5 100644 --- a/inprocess/build.gradle +++ b/inprocess/build.gradle @@ -14,8 +14,9 @@ tasks.named("jar").configure { } dependencies { - api project(':grpc-core') + api project(':grpc-api') + implementation project(':grpc-core') implementation libraries.guava testImplementation project(':grpc-testing'), testFixtures(project(':grpc-core')) diff --git a/interop-testing/build.gradle b/interop-testing/build.gradle index 9967fdfc10..204e2ddee5 100644 --- a/interop-testing/build.gradle +++ b/interop-testing/build.gradle @@ -24,6 +24,7 @@ dependencies { project(':grpc-rls'), project(':grpc-services'), project(':grpc-testing'), + project(':grpc-protobuf-lite'), project(path: ':grpc-xds', configuration: 'shadow'), libraries.hdrhistogram, libraries.truth, @@ -49,6 +50,8 @@ dependencies { project(':grpc-rls') testImplementation testFixtures(project(':grpc-api')), testFixtures(project(':grpc-core')), + project(':grpc-inprocess'), + project(':grpc-core'), libraries.mockito.core, libraries.okhttp alpnagent libraries.jetty.alpn.agent diff --git a/netty/build.gradle b/netty/build.gradle index 3150e8069b..c2bfe173d9 100644 --- a/netty/build.gradle +++ b/netty/build.gradle @@ -20,9 +20,10 @@ tasks.named("jar").configure { } dependencies { - api project(':grpc-core'), + api project(':grpc-api'), libraries.netty.codec.http2 - implementation libs.netty.handler.proxy, + implementation project(':grpc-core'), + libs.netty.handler.proxy, libraries.guava, libraries.errorprone.annotations, libraries.perfmark.api, diff --git a/okhttp/build.gradle b/okhttp/build.gradle index 7904b64e9c..8351b972be 100644 --- a/okhttp/build.gradle +++ b/okhttp/build.gradle @@ -15,8 +15,9 @@ tasks.named("jar").configure { } dependencies { - api project(':grpc-core') + api project(':grpc-api') implementation project(':grpc-util'), + project(':grpc-core'), libraries.okio, libraries.guava, libraries.perfmark.api diff --git a/protobuf/build.gradle b/protobuf/build.gradle index 8220b7da0d..ec38b39e65 100644 --- a/protobuf/build.gradle +++ b/protobuf/build.gradle @@ -27,7 +27,7 @@ dependencies { exclude group: 'com.google.api', module: 'api-common' } - api (project(':grpc-protobuf-lite')) { + implementation (project(':grpc-protobuf-lite')) { exclude group: 'com.google.protobuf', module: 'protobuf-javalite' } diff --git a/rls/build.gradle b/rls/build.gradle index 06b7530ea4..9e38ef3d86 100644 --- a/rls/build.gradle +++ b/rls/build.gradle @@ -25,6 +25,7 @@ dependencies { compileOnly libraries.javax.annotation testImplementation libraries.truth, project(':grpc-grpclb'), + project(':grpc-inprocess'), project(':grpc-testing'), project(':grpc-testing-proto'), testFixtures(project(':grpc-core')) diff --git a/services/build.gradle b/services/build.gradle index c9db8a09c4..de716c9fa1 100644 --- a/services/build.gradle +++ b/services/build.gradle @@ -23,10 +23,10 @@ tasks.named("jar").configure { } dependencies { - api project(':grpc-protobuf'), - project(':grpc-stub'), - project(':grpc-util') + api project(':grpc-stub') implementation project(':grpc-core'), + project(':grpc-protobuf'), + project(':grpc-util'), libraries.protobuf.java.util, libraries.guava.jre // JRE required by protobuf-java-util @@ -35,6 +35,7 @@ dependencies { libraries.gson // to fix checkUpperBoundDeps error here compileOnly libraries.javax.annotation testImplementation project(':grpc-testing'), + project(':grpc-inprocess'), libraries.netty.transport.epoll, // for DomainSocketAddress testFixtures(project(':grpc-core')), testFixtures(project(':grpc-api')) diff --git a/stub/build.gradle b/stub/build.gradle index eeebf0891b..867936f3ea 100644 --- a/stub/build.gradle +++ b/stub/build.gradle @@ -19,6 +19,7 @@ dependencies { libraries.guava implementation libraries.errorprone.annotations testImplementation libraries.truth, + project(':grpc-inprocess'), project(':grpc-testing'), testFixtures(project(':grpc-api')) signature libraries.signature.java diff --git a/testing/build.gradle b/testing/build.gradle index 43332ba8a7..a782a5fa1c 100644 --- a/testing/build.gradle +++ b/testing/build.gradle @@ -9,10 +9,11 @@ plugins { description = "gRPC: Testing" dependencies { - api project(':grpc-inprocess'), - project(':grpc-util'), + api project(':grpc-util'), project(':grpc-stub'), libraries.junit + implementation project(':grpc-inprocess') + implementation project(':grpc-core') // Only io.grpc.internal.testing.StatsTestUtils depends on opencensus_api, for internal use. compileOnly libraries.opencensus.api runtimeOnly project(":grpc-api") // Pull in newer version than census-api diff --git a/xds/build.gradle b/xds/build.gradle index 2f14dc6bf3..aa7f191752 100644 --- a/xds/build.gradle +++ b/xds/build.gradle @@ -48,6 +48,7 @@ dependencies { compileOnly sourceSets.thirdparty.output implementation project(':grpc-stub'), project(':grpc-core'), + project(':grpc-util'), project(':grpc-services'), project(':grpc-auth'), project(path: ':grpc-alts', configuration: 'shadow'), @@ -58,6 +59,7 @@ dependencies { def nettyDependency = implementation project(':grpc-netty') testImplementation project(':grpc-rls') + testImplementation project(':grpc-inprocess') testImplementation testFixtures(project(':grpc-core')), testFixtures(project(':grpc-api')), testFixtures(project(':grpc-util'))