Skip to content

Commit 1a8704e

Browse files
vkryachkodanasilver
authored andcommitted
Make dackka task depend on docStubs task. (#4072)
* Make dackka task depend on docStubs task. Otherwise no docs are produced for java sdks. * Fix toc.yaml path. * Fix tests and dgc url.
1 parent df25779 commit 1a8704e

File tree

2 files changed

+0
-14
lines changed

2 files changed

+0
-14
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ import org.gradle.workers.WorkAction
3535
import org.gradle.workers.WorkParameters
3636
import org.gradle.workers.WorkerExecutor
3737
import org.json.JSONObject
38-
3938
/**
4039
* Extension class for [GenerateDocumentationTask].
4140
*

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

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

289-
<<<<<<< HEAD
290289
val separateJavadoc =
291290
project.tasks.register<Copy>("separateJavadoc") {
292291
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))
299292

300293
val javadocClientFolder = project.childFile(dackkaOutputDirectory, "reference/client")
301294
val javadocComFolder = project.childFile(dackkaOutputDirectory, "reference/com")
302295

303-
<<<<<<< HEAD
304296
fromDirectory(javadocClientFolder)
305297
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))
311298

312299
into(outputJavadocFolder)
313300
}

0 commit comments

Comments
 (0)