diff --git a/javadoc_combined.gradle b/javadoc_combined.gradle index 19d29ad2aa..a121169339 100644 --- a/javadoc_combined.gradle +++ b/javadoc_combined.gradle @@ -67,12 +67,12 @@ class CombinedJavadocPlugin implements Plugin { } } + def dackkaOutputDir = project.file("$project.buildDir/docs/dackka") project.task(DACKKA_TASK_NAME, type: JavaExec) { doFirst { // Recreate the output directory to remove any leftover files from a previous run. - def outputDir = project.file("$project.buildDir/docs/dackka") - project.delete outputDir - project.mkdir outputDir + project.delete dackkaOutputDir + project.mkdir dackkaOutputDir // Download the Dackka JAR. new URL(DACKKA_JAR_URL).withInputStream { @@ -104,7 +104,7 @@ class CombinedJavadocPlugin implements Plugin { .filter({ f -> project.file(f).exists() }).join(";") def dependenciesString = project.files(dependencies).asPath.replace(':', ';') args("-moduleName", "", - "-outputDir", "$outputDir", + "-outputDir", "$dackkaOutputDir", "-globalLinks", "$globalLinksString", "-loggingLevel", "WARN", "-sourceSet", "-src $sourcesString -classpath $dependenciesString", @@ -113,6 +113,18 @@ class CombinedJavadocPlugin implements Plugin { } description = "Generates combined javadoc for developer.android.com." classpath = project.files(new File(getTemporaryDir(), "dackka.jar")) + doLast { + libraryModules.each { libraryModule -> + project.copy { + from "${libraryModule.projectDir}/src/main/javadoc" + into "${dackkaOutputDir}/reference/" + } + project.copy { + from "${libraryModule.projectDir}/src/main/javadoc" + into "${dackkaOutputDir}/reference/kotlin/" + } + } + } } } }