Merge pull request #117 from dropbox/jfein/fix-configuration

Task Configuration Avoidance fixes

Author: joshafeinberg

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

@@ -91,7 +91,7 @@ class AffectedModuleDetectorPlugin : Plugin<Project> {
 
     private fun withPlugin(pluginId: String, task: Task, testType: TestType, project: Project) {
         project.pluginManager.withPlugin(pluginId) {
-            getAffectedPath(testType, project)?.let {path ->
+            getAffectedPath(testType, project)?.let { path ->
                 task.dependsOn(path)
                 project.afterEvaluate {
                     project.tasks.findByPath(path)?.onlyIf {
@@ -129,7 +129,7 @@ class AffectedModuleDetectorPlugin : Plugin<Project> {
 
     private fun filterAndroidTests(project: Project) {
         val tracker = DependencyTracker(project, null)
-        project.tasks.all { task ->
+        project.tasks.configureEach { task ->
             if (task.name.contains("AndroidTest")) {
                 tracker.findAllDependents(project).forEach { dependentProject ->
                     dependentProject.tasks.forEach { dependentTask ->
@@ -143,7 +143,7 @@ class AffectedModuleDetectorPlugin : Plugin<Project> {
 
     // Only allow unit tests to run if the AffectedModuleDetector says to include them
     private fun filterJvmTests(project: Project) {
-        project.tasks.withType(Test::class.java) { task ->
+        project.tasks.withType(Test::class.java).configureEach { task ->
             AffectedModuleDetector.configureTaskGuard(task)
         }
     }

sample/buildSrc/src/main/kotlin/com/dropbox/sample/tasks/AffectedTasksPlugin.kt

@@ -109,7 +109,7 @@ class AffectedTasksPlugin : Plugin<Project> {
 
     private fun filterAndroidTests(project: Project) {
         val tracker = DependencyTracker(project, null)
-        project.tasks.all { task ->
+        project.tasks.configureEach { task ->
             if (task.name.contains(ANDROID_TEST_BUILD_VARIANT)) {
                 tracker.findAllDependents(project).forEach { dependentProject ->
                     dependentProject.tasks.forEach { dependentTask ->