commit a56b1c11f03c21d4796829f0a243ce5580ddb6ae
author Jeff Gaston <jeffrygaston@google.com> Thu Dec 10 18:25:15 2020 -0500
committer Jeff Gaston <jeffrygaston@google.com> Thu Dec 10 18:50:09 2020 -0500
tree b48497a0c1b3bedf4b08d81c3b4fba89f147e6b2
parent 8b24e0892100f297eddf72847f34ed3c1f8022b4

Running Doclava in parallel with other tasks via the Gradle Worker API

So that starting to run dokka doesn't need to wait for doclava to complete

On my computer, this reduces the time to run `./cleanBuild.sh -y zipDoclavaDocs zipDokkaDocs`:
  from 9m52s
  to   8m59s

Bug: 175149111
Test: ./cleanBuild.sh -y zipDoclavaDocs zipDokkaDocs
Test: Treehugger runs busytown/androidx.sh

Note that this change is similar to aosp/1161553 ; that knowledge could make it easier to review

Change-Id: Id3a1c8f7b142788d9809b10c4593c34272cb7c7f

buildSrc/src/main/kotlin/androidx/build/doclava/DoclavaTask.kt

diff --git a/buildSrc/src/main/kotlin/androidx/build/doclava/DoclavaTask.kt b/buildSrc/src/main/kotlin/androidx/build/doclava/DoclavaTask.kt
index 207f2cb..205bd58 100644
--- a/buildSrc/src/main/kotlin/androidx/build/doclava/DoclavaTask.kt
+++ b/buildSrc/src/main/kotlin/androidx/build/doclava/DoclavaTask.kt
@@ -17,8 +17,8 @@
 package androidx.build.doclava
 
 import org.gradle.api.DefaultTask
-import org.gradle.api.Project
 import org.gradle.api.file.FileCollection
+import org.gradle.api.provider.ListProperty
 import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.InputFiles
 import org.gradle.api.tasks.Internal
@@ -26,7 +26,12 @@
 import org.gradle.api.tasks.OutputDirectory
 import org.gradle.api.tasks.OutputFile
 import org.gradle.api.tasks.TaskAction
+import org.gradle.process.ExecOperations
+import org.gradle.workers.WorkAction
+import org.gradle.workers.WorkParameters
+import org.gradle.workers.WorkerExecutor
 import java.io.File
+import javax.inject.Inject
 
 // external/doclava/src/com/google/doclava/Errors.java
 val DEFAULT_DOCLAVA_CONFIG = ChecksConfig(
@@ -42,7 +47,9 @@
     )
 )
 
-open class DoclavaTask : DefaultTask() {
+abstract class DoclavaTask @Inject constructor(
+    private val workerExecutor: WorkerExecutor
+) : DefaultTask() {
 
     // All lowercase name to match MinimalJavadocOptions#docletpath
     private var docletpath: List<File> = emptyList()
@@ -206,7 +213,7 @@
     @TaskAction
     fun generate() {
         val args = computeArguments()
-        runDoclavaWithArgs(docletpath, project, args)
+        runDoclavaWithArgs(docletpath, args, workerExecutor)
     }
 }
 
@@ -252,11 +259,30 @@
     private val args = mutableListOf<String>()
 }
 
-fun runDoclavaWithArgs(classpath: List<File>, project: Project, args: List<String>) {
-    val result = project.javaexec { spec ->
-        spec.classpath = project.files(classpath)
-        spec.main = "com.google.doclava.Doclava"
-        spec.args = args
+interface DoclavaParams : WorkParameters {
+    fun getClasspath(): ListProperty<File>
+    fun getArgs(): ListProperty<String>
+}
+
+fun runDoclavaWithArgs(classpath: List<File>, args: List<String>, workerExecutor: WorkerExecutor) {
+    val workQueue = workerExecutor.noIsolation()
+    workQueue.submit(DoclavaWorkAction::class.java) { parameters ->
+        parameters.getArgs().set(args)
+        parameters.getClasspath().set(classpath)
     }
-    result.assertNormalExitValue()
+}
+
+abstract class DoclavaWorkAction @Inject constructor (
+    private val execOperations: ExecOperations
+) : WorkAction<DoclavaParams> {
+    override fun execute() {
+        val args = getParameters().getArgs().get()
+        val classpath = getParameters().getClasspath().get()
+
+        execOperations.javaexec {
+            it.classpath(classpath)
+            it.main = "com.google.doclava.Doclava"
+            it.args = args
+        }
+    }
 }