Skip to content

Commit 8e23643

Browse files
committed
Task Configuration Avoidance fixes
1 parent 897934e commit 8e23643

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ class AffectedModuleDetectorPlugin : Plugin<Project> {
9191

9292
private fun withPlugin(pluginId: String, task: Task, testType: TestType, project: Project) {
9393
project.pluginManager.withPlugin(pluginId) {
94-
getAffectedPath(testType, project)?.let {path ->
94+
getAffectedPath(testType, project)?.let { path ->
9595
task.dependsOn(path)
9696
project.afterEvaluate {
9797
project.tasks.findByPath(path)?.onlyIf {
@@ -129,7 +129,7 @@ class AffectedModuleDetectorPlugin : Plugin<Project> {
129129

130130
private fun filterAndroidTests(project: Project) {
131131
val tracker = DependencyTracker(project, null)
132-
project.tasks.all { task ->
132+
project.tasks.configureEach { task ->
133133
if (task.name.contains("AndroidTest")) {
134134
tracker.findAllDependents(project).forEach { dependentProject ->
135135
dependentProject.tasks.forEach { dependentTask ->
@@ -143,7 +143,7 @@ class AffectedModuleDetectorPlugin : Plugin<Project> {
143143

144144
// Only allow unit tests to run if the AffectedModuleDetector says to include them
145145
private fun filterJvmTests(project: Project) {
146-
project.tasks.withType(Test::class.java) { task ->
146+
project.tasks.withType(Test::class.java).configureEach { task ->
147147
AffectedModuleDetector.configureTaskGuard(task)
148148
}
149149
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ class AffectedTasksPlugin : Plugin<Project> {
109109

110110
private fun filterAndroidTests(project: Project) {
111111
val tracker = DependencyTracker(project, null)
112-
project.tasks.all { task ->
112+
project.tasks.configureEach { task ->
113113
if (task.name.contains(ANDROID_TEST_BUILD_VARIANT)) {
114114
tracker.findAllDependents(project).forEach { dependentProject ->
115115
dependentProject.tasks.forEach { dependentTask ->

0 commit comments

Comments
 (0)