Merge pull request #170 from dropbox/jfein/fix-register

Switch registering tasks to lazy
dropbox · Oct 31, 2022 · ae455b5 · ae455b5
2 parents bc56d36 + 0563972
commit ae455b5
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 22 deletions.
diff --git a/...tector/src/main/kotlin/com/dropbox/affectedmoduledetector/AffectedModuleDetectorPlugin.kt b/...tector/src/main/kotlin/com/dropbox/affectedmoduledetector/AffectedModuleDetectorPlugin.kt
@@ -90,14 +90,15 @@ class AffectedModuleDetectorPlugin : Plugin<Project> {
         customTasks: Set<AffectedModuleTaskType>
     ) {
         customTasks.forEach { taskType ->
-            val task = rootProject.tasks.register(taskType.commandByImpact).get()
-            task.group = CUSTOM_TASK_GROUP_NAME
-            task.description = taskType.taskDescription
-            disableConfigCache(task)
-
-            rootProject.subprojects { project ->
-                pluginIds.forEach { pluginId ->
-                    withPlugin(pluginId, task, taskType, project)
+            rootProject.tasks.register(taskType.commandByImpact) { task ->
+                task.group = CUSTOM_TASK_GROUP_NAME
+                task.description = taskType.taskDescription
+                disableConfigCache(task)
+
+                rootProject.subprojects { project ->
+                    pluginIds.forEach { pluginId ->
+                        withPlugin(pluginId, task, taskType, project)
+                    }
                 }
             }
         }
@@ -131,20 +132,19 @@ class AffectedModuleDetectorPlugin : Plugin<Project> {
         taskType: AffectedModuleTaskType,
         groupName: String
     ) {
-        val task = rootProject.tasks.register(taskType.commandByImpact).get()
-        task.group = groupName
-        task.description = taskType.taskDescription
-        disableConfigCache(task)
+        rootProject.tasks.register(taskType.commandByImpact) { task ->
+            task.group = groupName
+            task.description = taskType.taskDescription
+            disableConfigCache(task)
 
-        rootProject.subprojects { project ->
-            project.afterEvaluate { evaluatedProject ->
+            rootProject.subprojects { project ->
                 pluginIds.forEach { pluginId ->
                     if (pluginId == PLUGIN_JAVA_LIBRARY || pluginId == PLUGIN_KOTLIN) {
                         if (taskType == InternalTaskType.ANDROID_JVM_TEST) {
-                            withPlugin(pluginId, task, InternalTaskType.JVM_TEST, evaluatedProject)
+                            withPlugin(pluginId, task, InternalTaskType.JVM_TEST, project)
                         }
                     } else {
-                        withPlugin(pluginId, task, taskType, evaluatedProject)
+                        withPlugin(pluginId, task, taskType, project)
                     }
                 }
             }
@@ -175,12 +175,10 @@ class AffectedModuleDetectorPlugin : Plugin<Project> {
                     task.dependsOn(path)
                 }
 
-                project.afterEvaluate {
-                    project.tasks.findByPath(path)?.onlyIf { task ->
-                        when {
-                            !AffectedModuleDetector.isProjectEnabled(task.project) -> true
-                            else -> AffectedModuleDetector.isProjectAffected(task.project)
-                        }
+                project.tasks.findByPath(path)?.onlyIf { task ->
+                    when {
+                        !AffectedModuleDetector.isProjectEnabled(task.project) -> true
+                        else -> AffectedModuleDetector.isProjectAffected(task.project)
                     }
                 }
             }

diff --git a/...or/src/test/kotlin/com/dropbox/affectedmoduledetector/AffectedModuleDetectorPluginTest.kt b/...or/src/test/kotlin/com/dropbox/affectedmoduledetector/AffectedModuleDetectorPluginTest.kt
@@ -82,6 +82,7 @@ class AffectedModuleDetectorPluginTest {
         // GIVEN
         val task = fakeTask
         val plugin = AffectedModuleDetectorPlugin()
+        rootProject.pluginManager.apply(AffectedModuleDetectorPlugin::class.java)
 
         // WHEN
         plugin.registerInternalTask(