Skip to content

Commit f87b9d6

Browse files
committed
Update Groovydoc source dir traversal to non-recursive
Changed directory traversal from recursive to non-recursive when collecting source directories for Groovydoc.
1 parent c9d9a9d commit f87b9d6

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

grails-doc/build.gradle

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ combinedGroovydoc.configure { Groovydoc gdoc ->
9898
List<File> includedBuildSourceDirs = gradle.includedBuilds
9999
.collectMany { includedBuild ->
100100
def sourceDirs = []
101-
includedBuild.projectDir.eachDirRecurse { File dir ->
101+
includedBuild.projectDir.eachDir { File dir ->
102102
['src/main/java', 'src/main/groovy'].each { rel ->
103103
File sourceDir = new File(dir, rel)
104104
if (sourceDir.isDirectory()) {
@@ -110,8 +110,6 @@ combinedGroovydoc.configure { Groovydoc gdoc ->
110110
}
111111

112112
gdoc.source(project.files((baseSourceDirs + includedBuildSourceDirs).unique()))
113-
// Exclude files that are not part of the public API and cause duplicate class errors when combined with other source sets
114-
gdoc.exclude('org/grails/example/**', 'org.grails.example/**', 'another/**', 'TestJava**')
115113

116114
gdoc.classpath = files(sources.collect { SourceSet it -> it.compileClasspath.filter(File.&isDirectory) }.flatten().unique())
117115
gdoc.destinationDir = project.layout.buildDirectory.dir('combined-api/api').get().asFile

0 commit comments

Comments
 (0)