ci_jobs plugin clean up

buildSrc/src/main/kotlin/CIJobsExtensions.kt

@@ -5,104 +5,105 @@ import org.gradle.api.Task
 import org.gradle.kotlin.dsl.extra
 
 /**
- * Checks if a task is affected by git changes
+ * Returns the task's path, given affected projects, if this task or its dependencies are affected by git changes.
  */
-internal fun isAffectedBy(baseTask: Task, affectedProjects: Map<Project, Set<String>>): String? {
-    val visited = mutableSetOf<Task>()
-    val queue = mutableListOf(baseTask)
+internal fun findAffectedTaskPath(baseTask: Task, affectedProjects: Map<Project, Set<String>>): String? {
+  val visited = mutableSetOf<Task>()
+  val queue = mutableListOf(baseTask)
+
+  while (queue.isNotEmpty()) {
+    val t = queue.removeAt(0)
+    if (visited.contains(t)) {
+      continue
+    }
+    visited.add(t)
 
-    while (queue.isNotEmpty()) {
-        val t = queue.removeAt(0)
-        if (visited.contains(t)) {
-            continue
-        }
-        visited.add(t)
-
-        val affectedTasks = affectedProjects[t.project]
-        if (affectedTasks != null) {
-            if (affectedTasks.contains("all")) {
-                return "${t.project.path}:${t.name}"
-            }
-            if (affectedTasks.contains(t.name)) {
-                return "${t.project.path}:${t.name}"
-            }
-        }
-
-        t.taskDependencies.getDependencies(t).forEach { queue.add(it) }
+    val affectedTasks = affectedProjects[t.project]
+    if (affectedTasks != null) {
+      if (affectedTasks.contains("all")) {
+        return "${t.project.path}:${t.name}"
+      }
+      if (affectedTasks.contains(t.name)) {
+        return "${t.project.path}:${t.name}"
+      }
     }
-    return null
+
+    t.taskDependencies.getDependencies(t).forEach { queue.add(it) }
+  }
+  return null
 }
 
 /**
  * Creates a single aggregate root task that depends on matching subproject tasks
  */
 private fun Project.createRootTask(
-    rootTaskName: String,
-    subProjTaskName: String,
-    includePrefixes: List<String>,
-    excludePrefixes: List<String>,
-    forceCoverage: Boolean
+  rootTaskName: String,
+  subProjTaskName: String,
+  includePrefixes: List<String>,
+  excludePrefixes: List<String>,
+  forceCoverage: Boolean
 ) {
-    val coverage = forceCoverage || rootProject.hasProperty("checkCoverage")
-    tasks.register(rootTaskName) {
-        subprojects.forEach { subproject ->
-            val activePartition = subproject.extra.get("activePartition") as Boolean
-            if (activePartition &&
-                includePrefixes.any { subproject.path.startsWith(it) } &&
-                !excludePrefixes.any { subproject.path.startsWith(it) }) {
-
-                val testTask = subproject.tasks.findByName(subProjTaskName)
-                var isAffected = true
-
-                if (testTask != null) {
-                    val useGitChanges = rootProject.extra.get("useGitChanges") as Boolean
-                    if (useGitChanges) {
-                        @Suppress("UNCHECKED_CAST")
-                        val affectedProjects = rootProject.extra.get("affectedProjects") as Map<Project, Set<String>>
-                        val fileTrigger = isAffectedBy(testTask, affectedProjects)
-                        if (fileTrigger != null) {
-                            logger.warn("Selecting ${subproject.path}:$subProjTaskName (triggered by $fileTrigger)")
-                        } else {
-                            logger.warn("Skipping ${subproject.path}:$subProjTaskName (not affected by changed files)")
-                            isAffected = false
-                        }
-                    }
-                    if (isAffected) {
-                        dependsOn(testTask)
-                    }
-                }
-
-                if (isAffected && coverage) {
-                    val coverageTask = subproject.tasks.findByName("jacocoTestReport")
-                    if (coverageTask != null) {
-                        dependsOn(coverageTask)
-                    }
-                    val verificationTask = subproject.tasks.findByName("jacocoTestCoverageVerification")
-                    if (verificationTask != null) {
-                        dependsOn(verificationTask)
-                    }
-                }
+  val coverage = forceCoverage || rootProject.providers.gradleProperty("checkCoverage").isPresent
+  tasks.register(rootTaskName) {
+    subprojects.forEach { subproject ->
+      val activePartition = subproject.extra.get("activePartition") as Boolean
+      if (
+        activePartition &&
+        includePrefixes.any { subproject.path.startsWith(it) } &&
+        !excludePrefixes.any { subproject.path.startsWith(it) }
+      ) {
+        val testTask = subproject.tasks.findByName(subProjTaskName)
+        var isAffected = true
+
+        if (testTask != null) {
+          val useGitChanges = rootProject.extra.get("useGitChanges") as Boolean
+          if (useGitChanges) {
+            @Suppress("UNCHECKED_CAST")
+            val affectedProjects = rootProject.extra.get("affectedProjects") as Map<Project, Set<String>>
+            val affectedTaskPath = findAffectedTaskPath(testTask, affectedProjects)
+            if (affectedTaskPath != null) {
+              logger.warn("Selecting ${subproject.path}:$subProjTaskName (affected by $affectedTaskPath)")
+            } else {
+              logger.warn("Skipping ${subproject.path}:$subProjTaskName (not affected by changed files)")
+              isAffected = false
             }
+          }
+          if (isAffected) {
+            dependsOn(testTask)
+          }
+        }
+
+        if (isAffected && coverage) {
+          val coverageTask = subproject.tasks.findByName("jacocoTestReport")
+          if (coverageTask != null) {
+            dependsOn(coverageTask)
+          }
+          val verificationTask = subproject.tasks.findByName("jacocoTestCoverageVerification")
+          if (verificationTask != null) {
+            dependsOn(verificationTask)
+          }
         }
+      }
     }
+  }
 }
 
 /**
  * Creates aggregate test tasks for CI using createRootTask() above
- * 
+ *
  * Creates three subtasks for the given base task name:
  * - ${baseTaskName}Test - runs allTests
  * - ${baseTaskName}LatestDepTest - runs allLatestDepTests
  * - ${baseTaskName}Check - runs check
  */
 fun Project.testAggregate(
-    baseTaskName: String,
-    includePrefixes: List<String>,
-    excludePrefixes: List<String> = emptyList(),
-    forceCoverage: Boolean = false
+  baseTaskName: String,
+  includePrefixes: List<String>,
+  excludePrefixes: List<String> = emptyList(),
+  forceCoverage: Boolean = false
 ) {
-    createRootTask("${baseTaskName}Test", "allTests", includePrefixes, excludePrefixes, forceCoverage)
-    createRootTask("${baseTaskName}LatestDepTest", "allLatestDepTests", includePrefixes, excludePrefixes, forceCoverage)
-    createRootTask("${baseTaskName}Check", "check", includePrefixes, excludePrefixes, forceCoverage)
+  createRootTask("${baseTaskName}Test", "allTests", includePrefixes, excludePrefixes, forceCoverage)
+  createRootTask("${baseTaskName}LatestDepTest", "allLatestDepTests", includePrefixes, excludePrefixes, forceCoverage)
+  createRootTask("${baseTaskName}Check", "check", includePrefixes, excludePrefixes, forceCoverage)
 }