[groovy] branch master updated: javadoc should pick up package.html

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[groovy] branch master updated: javadoc should pick up package.html

paulk
This is an automated email from the ASF dual-hosted git repository.

paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git


The following commit(s) were added to refs/heads/master by this push:
     new aabd690  javadoc should pick up package.html
aabd690 is described below

commit aabd690e3593742ddcdb0121d6c06e643d8b5ab4
Author: Paul King <[hidden email]>
AuthorDate: Tue Oct 13 16:17:22 2020 +1000

    javadoc should pick up package.html
---
 buildSrc/src/main/groovy/org.apache.groovy-doc-aggregator.gradle | 2 +-
 buildSrc/src/main/groovy/org.apache.groovy-documented.gradle     | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/buildSrc/src/main/groovy/org.apache.groovy-doc-aggregator.gradle b/buildSrc/src/main/groovy/org.apache.groovy-doc-aggregator.gradle
index f23ce4d..617e4c7 100644
--- a/buildSrc/src/main/groovy/org.apache.groovy-doc-aggregator.gradle
+++ b/buildSrc/src/main/groovy/org.apache.groovy-doc-aggregator.gradle
@@ -72,7 +72,7 @@ def sourcesAllJar = tasks.register("sourcesAllJar", Jar) {
 def javadocAll = tasks.register("javadocAll", Javadoc) {
     destinationDir = file("$buildDir/alljavadoc")
     source configurations.allSources
-    classpath = configurations.allSourcesRuntimeClasspath
+    classpath = configurations.allSourcesRuntimeClasspath + configurations.allSources
     docAggregation.excludedFromJavadocs.each {
         exclude it
     }
diff --git a/buildSrc/src/main/groovy/org.apache.groovy-documented.gradle b/buildSrc/src/main/groovy/org.apache.groovy-documented.gradle
index c84ca3f..f2990f0 100644
--- a/buildSrc/src/main/groovy/org.apache.groovy-documented.gradle
+++ b/buildSrc/src/main/groovy/org.apache.groovy-documented.gradle
@@ -51,6 +51,7 @@ tasks.withType(Javadoc).configureEach {
         addStringOption('Xdoclint:none', '-quiet')
         windowTitle = "Groovy ${versions.groovy}"
         docTitle = "Groovy ${versions.groovy}"
+        classpath += project.file('src/main/java') // to pick up package.html
         locale = 'en_US'
         encoding = 'UTF-8'
         version = true