mirror of https://github.com/grpc/grpc-java.git
interop-testing: Correctly expose API types to dependents
Interop-testing is both binaries and a library. It hadn't been updated
to use java-library and to expose API-surface dependencies to
dependents.
This fixes the error:
```
> Task :grpc-gae-interop-testing-jdk8:javadoc FAILED
javadoc: error - An internal exception has occurred.
(com.sun.tools.javac.code.Symbol$CompletionFailure: class file for io.grpc.internal.testing.StreamRecorder not found)
Please file a bug against the javadoc tool via the Java bug reporting page
(http://bugreport.java.com) after checking the Bug Database (http://bugs.java.com)
for duplicates. Include error messages and the following diagnostic in your report. Thank you.
com.sun.tools.javac.code.Symbol$CompletionFailure: class file for io.grpc.internal.testing.StreamRecorder not found
1 error
```
This commit is contained in:
parent
55c5040cb5
commit
1fc3649556
|
|
@ -166,7 +166,3 @@ tasks.register("runInteropTestRemote") {
|
||||||
throw new GradleException("Interop test failed:\nthrowable:${caught}")
|
throw new GradleException("Interop test failed:\nthrowable:${caught}")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.named("javadoc").configure {
|
|
||||||
enabled = false
|
|
||||||
}
|
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
plugins {
|
plugins {
|
||||||
id "application"
|
id "application"
|
||||||
id "java"
|
id "java-library"
|
||||||
id "maven-publish"
|
id "maven-publish"
|
||||||
|
|
||||||
id "com.google.protobuf"
|
id "com.google.protobuf"
|
||||||
|
|
@ -21,17 +21,19 @@ dependencies {
|
||||||
project(':grpc-googleapis'),
|
project(':grpc-googleapis'),
|
||||||
project(':grpc-netty'),
|
project(':grpc-netty'),
|
||||||
project(':grpc-okhttp'),
|
project(':grpc-okhttp'),
|
||||||
project(':grpc-protobuf'),
|
|
||||||
project(':grpc-rls'),
|
project(':grpc-rls'),
|
||||||
project(':grpc-services'),
|
project(':grpc-services'),
|
||||||
project(':grpc-stub'),
|
|
||||||
project(':grpc-testing'),
|
project(':grpc-testing'),
|
||||||
project(path: ':grpc-xds', configuration: 'shadow'),
|
project(path: ':grpc-xds', configuration: 'shadow'),
|
||||||
libraries.hdrhistogram,
|
libraries.hdrhistogram,
|
||||||
libraries.junit,
|
|
||||||
libraries.truth,
|
libraries.truth,
|
||||||
libraries.opencensus.contrib.grpc.metrics,
|
libraries.opencensus.contrib.grpc.metrics,
|
||||||
libraries.google.auth.oauth2Http
|
libraries.google.auth.oauth2Http,
|
||||||
|
libraries.guava.jre // Fix checkUpperBoundDeps using -android
|
||||||
|
api project(':grpc-api'),
|
||||||
|
project(':grpc-stub'),
|
||||||
|
project(':grpc-protobuf'),
|
||||||
|
libraries.junit
|
||||||
compileOnly libraries.javax.annotation
|
compileOnly libraries.javax.annotation
|
||||||
// TODO(sergiitk): replace with com.google.cloud:google-cloud-logging
|
// TODO(sergiitk): replace with com.google.cloud:google-cloud-logging
|
||||||
// Used instead of google-cloud-logging because it's failing
|
// Used instead of google-cloud-logging because it's failing
|
||||||
|
|
|
||||||
|
|
@ -2130,7 +2130,7 @@ public abstract class AbstractInteropTest {
|
||||||
assertTrue(tooManyFailuresErrorMessage, totalFailures <= maxFailures);
|
assertTrue(tooManyFailuresErrorMessage, totalFailures <= maxFailures);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected static void assertSuccess(StreamRecorder<?> recorder) {
|
private static void assertSuccess(StreamRecorder<?> recorder) {
|
||||||
if (recorder.getError() != null) {
|
if (recorder.getError() != null) {
|
||||||
throw new AssertionError(recorder.getError());
|
throw new AssertionError(recorder.getError());
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue