Set up dependOn task only if project is affected

Author: kozaxinan

affectedmoduledetector/src/main/kotlin/com/dropbox/affectedmoduledetector/AffectedModuleDetectorPlugin.kt

@@ -159,7 +159,7 @@ class AffectedModuleDetectorPlugin : Plugin<Project> {
 
     private fun withPlugin(
         pluginId: String,
-        task: Task,
+        taskToConfigure: Task,
         testType: AffectedModuleTaskType,
         project: Project
     ) {
@@ -171,16 +171,18 @@ class AffectedModuleDetectorPlugin : Plugin<Project> {
 
         project.pluginManager.withPlugin(pluginId) {
             getAffectedPath(testType, project)?.let { path ->
-                val pathOrNull = project.tasks.findByPath(path)
-                if (AffectedModuleDetector.isProjectProvided(project) && !isExcludedModule(config, path) && pathOrNull != null) {
-                    task.dependsOn(path)
-                }
-
-                pathOrNull?.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)
+                        }.also { onlyIf ->
+                            if (onlyIf && AffectedModuleDetector.isProjectProvided(project) && !isExcludedModule(config, path)) {
+                                taskToConfigure.dependsOn(path)
+                            }
+                        }
                 }
             }
         }

affectedmoduledetector/src/test/kotlin/com/dropbox/affectedmoduledetector/AffectedModuleDetectorIntegrationTest.kt

@@ -111,8 +111,8 @@ class AffectedModuleDetectorIntegrationTest {
             .build()
 
         // THEN
-        assertThat(result.output).contains(":sample-app:assembleDebugAndroidTest SKIPPED")
-        assertThat(result.output).contains(":sample-core:assembleAndroidTest SKIPPED")
+        assertThat(result.output).doesNotContain(":sample-app:assembleDebugAndroidTest SKIPPED")
+        assertThat(result.output).doesNotContain(":sample-core:assembleAndroidTest SKIPPED")
         assertThat(result.output).contains(":assembleAffectedAndroidTests SKIPPED")
     }
 
@@ -189,8 +189,8 @@ class AffectedModuleDetectorIntegrationTest {
             .build()
 
         // THEN
-        assertThat(result.output).contains(":sample-app:assembleDebugAndroidTest SKIPPED")
+        assertThat(result.output).doesNotContain(":sample-app:assembleDebugAndroidTest SKIPPED")
         assertThat(result.output).doesNotContain(":sample-core:assembleAndroidTest SKIPPED")
         assertThat(result.output).contains(":assembleAffectedAndroidTests SKIPPED")
     }
-}
+}