Simplify code

Author: smola

gradle/ci_jobs.gradle

@@ -18,37 +18,31 @@ allprojects { project ->
   }
 }
 
-Set<Task> getTaskDependenciesRecursive(Task baseTask, Set<Task> visited = []) {
-  if (visited.contains(baseTask)) {
-    return []
-  }
-  Set<Task> dependencies = [baseTask]
-  visited.add(baseTask)
-  for (td in baseTask.taskDependencies) {
-    for (t in td.getDependencies(baseTask)) {
-      dependencies.add(t)
-      dependencies.addAll(getTaskDependenciesRecursive(t, visited))
-    }
-  }
-  return dependencies
-}
-
 File relativeToGitRoot(File f) {
   return rootProject.projectDir.toPath().relativize(f.absoluteFile.toPath()).toFile()
 }
 
 String isAffectedBy(Task baseTask, Map<Project, Set<String>> affectedProjects) {
-  for (Task t in getTaskDependenciesRecursive(baseTask)) {
-    if (!affectedProjects.containsKey(t.project)) {
+  HashSet<Task> visited = []
+  LinkedList<Task> queue = [baseTask]
+  while (!queue.isEmpty()) {
+    Task t = queue.poll()
+    if (visited.contains(t)) {
       continue
     }
+    visited.add(t)
+
     final Set<String> affectedTasks = affectedProjects.get(t.project)
-    if (affectedTasks.contains("all")) {
-      return "${t.project.path}:${t.name}"
-    }
-    if (affectedTasks.contains(t.name)) {
-      return "${t.project.path}:${t.name}"
+    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.each { queue.addAll(it.getDependencies(t)) }
   }
   return null
 }
@@ -75,19 +69,14 @@ rootProject.ext {
 }
 
 if (rootProject.hasProperty("gitBaseRef")) {
-  // -PgitBaseRef sets the base git reference to compare changes to. In CI, this should generally be set to the target
-  // branch, usually master.
   final String baseRef = rootProject.property("gitBaseRef")
-  // -PgitNewRef sets the new git new reference to compare changes to. This is useful for testing the test selection method
-  // itself. Otherwise, comparing against current HEAD is what makes sense for CI.
   final String newRef = rootProject.hasProperty("gitNewRef") ? rootProject.property("gitNewRef") : "HEAD"
 
   rootProject.ext {
     it.changedFiles = getChangedFiles(baseRef, newRef)
     useGitChanges = true
   }
 
-  // The ignoredFiles FileTree selects any file that should not trigger any tasks.
   final ignoredFiles = fileTree(rootProject.projectDir) {
     include '.gitignore', '.editorconfig'
     include '*.md', '**/*.md'
@@ -102,8 +91,6 @@ if (rootProject.hasProperty("gitBaseRef")) {
   }
   rootProject.changedFiles = rootProject.changedFiles.findAll { !ignoredFiles.contains(it) }
 
-  // The globalEffectsFile FileTree selects any file that should trigger all tasks, regardless of gradle dependency
-  // tracking.
   final globalEffectFiles = fileTree(rootProject.projectDir) {
     include '.circleci/**'
     include 'build.gradle'
@@ -119,9 +106,8 @@ if (rootProject.hasProperty("gitBaseRef")) {
   }
 
   if (rootProject.useGitChanges) {
-    logger.warn("Git change tracking is enabled, base: ${baseRef}")
+    logger.warn("Git change tracking is enabled: ${baseRef}..${newRef}")
 
-    // Get all projects, sorted by descending path length.
     final projects = subprojects.sort { a, b -> b.projectDir.path.length() <=> a.projectDir.path.length() }
     Map<Project, Set<String>> _affectedProjects = [:]
     final List<Map<String, String>> matchers = [
@@ -146,7 +132,6 @@ if (rootProject.hasProperty("gitBaseRef")) {
       it.affectedProjects = _affectedProjects
     }
   }
-
 }
 
 def testAggregate(String baseTaskName, includePrefixes, excludePrefixes, boolean forceCoverage = false) {