Skip to content

Commit df25779

Browse files
daymxndanasilver
authored andcommitted
Move external documentation links to a task input in Dackka (#4033)
* Move external links in dackka to an input This will allow the package-list files to be cached, and monitored for updates. * Maybe fixed merge conflict * Fixed formatting * Removed duplicate configurations
1 parent c248b5a commit df25779

File tree

1 file changed

+13
-0
lines changed

1 file changed

+13
-0
lines changed

buildSrc/src/main/java/com/google/firebase/gradle/plugins/DackkaPlugin.kt

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -286,15 +286,28 @@ abstract class DackkaPlugin : Plugin<Project> {
286286
val outputJavadocFolder = project.childFile(outputDirectory, "android")
287287
val outputKotlindocFolder = project.childFile(outputDirectory, "kotlin")
288288

289+
<<<<<<< HEAD
289290
val separateJavadoc =
290291
project.tasks.register<Copy>("separateJavadoc") {
291292
dependsOn("generateDackkaDocumentation")
293+
=======
294+
docsTask.configure {
295+
// this will become useful with the agp upgrade, as they're separate in 7.x+
296+
val sourcesForKotlin = emptyList<File>()
297+
val packageLists = fetchPackageLists(project)
298+
>>>>>>> b159f2703 (Move external documentation links to a task input in Dackka (#4033))
292299

293300
val javadocClientFolder = project.childFile(dackkaOutputDirectory, "reference/client")
294301
val javadocComFolder = project.childFile(dackkaOutputDirectory, "reference/com")
295302

303+
<<<<<<< HEAD
296304
fromDirectory(javadocClientFolder)
297305
fromDirectory(javadocComFolder)
306+
=======
307+
javaSources.set(fixedJavaSources)
308+
suppressedFiles.set(excludedFiles)
309+
packageListFiles.set(packageLists)
310+
>>>>>>> b159f2703 (Move external documentation links to a task input in Dackka (#4033))
298311

299312
into(outputJavadocFolder)
300313
}

0 commit comments

Comments
 (0)