@@ -142,9 +142,10 @@ def testAggregate(String baseTaskName, includePrefixes, excludePrefixes, boolean
142142 tasks. register(rootTaskName) { aggTest ->
143143 subprojects { subproject ->
144144 if (subproject. property(" activePartition" ) && includePrefixes. any { subproject. path. startsWith(it) } && ! excludePrefixes. any { subproject. path. startsWith(it) }) {
145- Task testTask = subproject. tasks. findByName (subProjTaskName)
145+ def testTaskProvider = subproject. tasks. named (subProjTaskName)
146146 boolean isAffected = true
147- if (testTask != null ) {
147+ if (testTaskProvider. present) {
148+ Task testTask = testTaskProvider. get()
148149 if (rootProject. useGitChanges) {
149150 final fileTrigger = isAffectedBy(testTask, rootProject. property(" affectedProjects" ))
150151 if (fileTrigger != null ) {
@@ -155,16 +156,16 @@ def testAggregate(String baseTaskName, includePrefixes, excludePrefixes, boolean
155156 }
156157 }
157158 if (isAffected) {
158- aggTest. dependsOn(testTask )
159+ aggTest. dependsOn(testTaskProvider )
159160 }
160161 }
161162 if (isAffected && coverage) {
162- def coverageTask = subproject. tasks. findByName (" jacocoTestReport" )
163- if (coverageTask != null ) {
163+ def coverageTask = subproject. tasks. named (" jacocoTestReport" )
164+ if (coverageTask. present ) {
164165 aggTest. dependsOn(coverageTask)
165166 }
166- coverageTask = subproject. tasks. findByName (" jacocoTestCoverageVerification" )
167- if (coverageTask != null ) {
167+ coverageTask = subproject. tasks. named (" jacocoTestCoverageVerification" )
168+ if (coverageTask. present ) {
168169 aggTest. dependsOn(coverageTask)
169170 }
170171 }
0 commit comments