all: Filter out Internal* classes from Javadoc

ejona86 · web-flow · commit cb53bbf0bebc · 2017-06-16T14:53:51.000-07:00
core's sources already have filters applied, so it isn't necessary to
copy them to all.
diff --git 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
@@ -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
@@ -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 {

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,6 @@ javadoc {`
`46`	`46`	`source subproject.javadoc.source`
`47`	`47`	`options.links subproject.javadoc.options.links.toArray(new String[0])`
`48`	`48`	`}`
`49`		`- exclude 'io/grpc/internal/**'`
`50`	`49`	`}`
`51`	`50`
`52`	`51`	`task jacocoMerge(type: JacocoMerge) {`
Original file line number	Diff line number	Diff line change
`@@ -10,4 +10,8 @@ dependencies {`
`10`	`10`	`signature "org.codehaus.mojo.signature:java16:+@signature"`
`11`	`11`	`}`
`12`	`12`
`13`		`-javadoc.exclude 'io/grpc/internal/**'`
	`13`	`+javadoc {`
	`14`	`+ // We want io.grpc.Internal, but not io.grpc.Internal*`
	`15`	`+ exclude 'io/grpc/Internal?*.java'`
	`16`	`+ exclude 'io/grpc/internal/**'`
	`17`	`+}`