File tree Expand file tree Collapse file tree 2 files changed +0
-14
lines changed
buildSrc/src/main/java/com/google/firebase/gradle/plugins Expand file tree Collapse file tree 2 files changed +0
-14
lines changed Original file line number Diff line number Diff line change @@ -35,7 +35,6 @@ import org.gradle.workers.WorkAction
35
35
import org.gradle.workers.WorkParameters
36
36
import org.gradle.workers.WorkerExecutor
37
37
import org.json.JSONObject
38
-
39
38
/* *
40
39
* Extension class for [GenerateDocumentationTask].
41
40
*
Original file line number Diff line number Diff line change @@ -286,28 +286,15 @@ abstract class DackkaPlugin : Plugin<Project> {
286
286
val outputJavadocFolder = project.childFile(outputDirectory, " android" )
287
287
val outputKotlindocFolder = project.childFile(outputDirectory, " kotlin" )
288
288
289
- <<<<<<< HEAD
290
289
val separateJavadoc =
291
290
project.tasks.register<Copy >(" separateJavadoc" ) {
292
291
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 ))
299
292
300
293
val javadocClientFolder = project.childFile(dackkaOutputDirectory, " reference/client" )
301
294
val javadocComFolder = project.childFile(dackkaOutputDirectory, " reference/com" )
302
295
303
- <<<<<<< HEAD
304
296
fromDirectory(javadocClientFolder)
305
297
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 ))
311
298
312
299
into(outputJavadocFolder)
313
300
}
You can’t perform that action at this time.
0 commit comments