From cb53bbf0bebc246b20c5140b6c5e5647836cccbb Mon Sep 17 00:00:00 2001 From: Eric Anderson Date: Fri, 16 Jun 2017 14:53:51 -0700 Subject: [PATCH] all: Filter out Internal* classes from Javadoc core's sources already have filters applied, so it isn't necessary to copy them to all. --- all/build.gradle | 1 - core/build.gradle | 6 +++++- netty/build.gradle | 5 ++++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/all/build.gradle b/all/build.gradle index 5a7a28832a..bf3dad5387 100644 --- a/all/build.gradle +++ b/all/build.gradle @@ -46,7 +46,6 @@ javadoc { source subproject.javadoc.source options.links subproject.javadoc.options.links.toArray(new String[0]) } - exclude 'io/grpc/internal/**' } task jacocoMerge(type: JacocoMerge) { diff --git a/core/build.gradle b/core/build.gradle index b833db032d..28d17a7e4f 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -10,4 +10,8 @@ dependencies { signature "org.codehaus.mojo.signature:java16:+@signature" } -javadoc.exclude 'io/grpc/internal/**' +javadoc { + // We want io.grpc.Internal, but not io.grpc.Internal* + exclude 'io/grpc/Internal?*.java' + exclude 'io/grpc/internal/**' +} diff --git a/netty/build.gradle b/netty/build.gradle index a06e63e1f7..954fdadb75 100644 --- a/netty/build.gradle +++ b/netty/build.gradle @@ -16,7 +16,10 @@ dependencies { it.options.compilerArgs += ["-Xep:FutureReturnValueIgnored:OFF"] } -javadoc.options.links 'http://netty.io/4.1/api/' +javadoc { + options.links 'http://netty.io/4.1/api/' + exclude 'io/grpc/netty/Internal*' +} project.sourceSets { main {