Merge pull request #169 from gradle/no/rerun-task

Fix bug when calling `--rerun-tasks` with configuration cache enabled.

Author: ghale

src/main/groovy/org/gradle/android/workarounds/AbstractCompileLibraryResourcesWorkaround_4_2_orHigher.groovy

@@ -17,12 +17,6 @@ abstract class AbstractCompileLibraryResourcesWorkaround_4_2_orHigher implements
         return Class.forName('com.android.build.gradle.tasks.CompileLibraryResourcesTask')
     }
 
-    protected void setPropertyValue(Task task, ConfigurableFileCollection directoryProperty) {
-        Field field = task.class.getDeclaredFields().find { it.name == "__${propertyName}__" }
-        field.setAccessible(true)
-        field.set(task, directoryProperty)
-    }
-
     @Override
     void apply(WorkaroundContext context) {
         Project project = context.project
@@ -34,17 +28,23 @@ abstract class AbstractCompileLibraryResourcesWorkaround_4_2_orHigher implements
                 .withPropertyName("${propertyName}.workaround")
                 .optional()
             project.gradle.taskGraph.whenReady {
+                def propName = propertyName
+                def setPropertyValue = { ConfigurableFileCollection directoryProperty ->
+                    Field field = task.class.getDeclaredFields().find { it.name == "__${propName}__" }
+                    field.setAccessible(true)
+                    field.set(task, directoryProperty)
+                }
+
                 originalPropertyValue.from(task.getProperty(propertyName))
                 def dummyProperty = project.objects.fileCollection()
                 // Non-existent file to give the ConfigurableFileCollection a value.
                 dummyProperty.setFrom(project.file('/doesnt-exist'))
-                setPropertyValue(task, dummyProperty)
+                setPropertyValue(dummyProperty)
 
                 // Set the task property back to its original value
                 task.doFirst {
-                    setPropertyValue(it, originalPropertyValue)
+                    setPropertyValue(originalPropertyValue)
                 }
-
             }
         }
     }

src/test/groovy/org/gradle/android/RerunTasksTest.groovy

@@ -0,0 +1,34 @@
+package org.gradle.android
+
+import org.gradle.testkit.runner.TaskOutcome
+import org.gradle.util.VersionNumber
+import org.junit.Assume
+
+@MultiVersionTest
+class RerunTasksTest extends AbstractTest {
+
+    def "test with configuration cache and --rerun-tasks works"() {
+        Assume.assumeTrue(TestVersions.latestAndroidVersionForCurrentJDK() >= VersionNumber.parse("4.2.0-alpha01"))
+
+        def projectDir = temporaryFolder.newFolder()
+        SimpleAndroidApp.builder(projectDir, cacheDir)
+                .withKotlinVersion(VersionNumber.parse("1.5.0"))
+                .build()
+                .writeProject()
+
+        withGradleVersion("7.0")
+                .withProjectDir(projectDir)
+                .withArguments("assembleDebug", "--stacktrace", "--rerun-tasks", "--configuration-cache")
+                .build()
+
+        when:
+        def result = withGradleVersion("7.0")
+                .withProjectDir(projectDir)
+                .withArguments("assembleDebug", "--stacktrace", "--rerun-tasks", "--configuration-cache")
+                .build()
+
+        then:
+        result.task(":library:assembleDebug").outcome == TaskOutcome.SUCCESS
+        result.task(":library:compileDebugLibraryResources").outcome == TaskOutcome.SUCCESS
+    }
+}

src/test/groovy/org/gradle/android/SimpleAndroidApp.groovy

@@ -451,8 +451,9 @@ class SimpleAndroidApp {
         boolean kaptWorkersEnabled = true
         RoomConfiguration roomConfiguration = RoomConfiguration.ROOM_EXTENSION
 
-        VersionNumber androidVersion = Versions.latestAndroidVersion()
+        VersionNumber androidVersion = TestVersions.latestAndroidVersionForCurrentJDK()
         VersionNumber kotlinVersion = TestVersions.latestSupportedKotlinVersion()
+
         File projectDir
         File cacheDir