Keep ExtractAnnotations cacheable

Author: lptr

src/main/groovy/org/gradle/android/AndroidCacheFixPlugin.groovy

@@ -13,7 +13,6 @@ import groovy.transform.CompileStatic
 import groovy.transform.TypeCheckingMode
 import org.gradle.api.Plugin
 import org.gradle.api.Project
-import org.gradle.api.specs.Specs
 import org.gradle.api.tasks.CacheableTask
 import org.gradle.api.tasks.PathSensitivity
 import org.gradle.internal.Factory
@@ -33,7 +32,7 @@ class AndroidCacheFixPlugin implements Plugin<Project> {
         new AndroidJavaCompile_BootClasspath_Workaround(),
         new AndroidJavaCompile_AnnotationProcessorSource_Workaround(),
         new AndroidJavaCompile_ProcessorListFile_Workaround(),
-        new ExtractAnnotations_Disable_Workaround(),
+        new ExtractAnnotations_Source_Workaround(),
         new IncrementalTask_CombinedInput_Workaround(),
         new StreamBasedTask_CombinedInput_Workaround(),
         new ProcessAndroidResources_MergeBlameLogFolder_Workaround(),
@@ -169,14 +168,23 @@ class AndroidCacheFixPlugin implements Plugin<Project> {
     }
 
     /**
-     * Disables caching for {@link ExtractAnnotations#getSource()} as the path sensitivity of {@code source} cannot be overridden.
+     * Override path sensitivity for {@link ExtractAnnotations#getSource()} to {@link PathSensitivity#RELATIVE}.
      */
-    static class ExtractAnnotations_Disable_Workaround implements Workaround {
+    static class ExtractAnnotations_Source_Workaround implements Workaround {
         @CompileStatic(TypeCheckingMode.SKIP)
         @Override
         void apply(Project project) {
             project.tasks.withType(ExtractAnnotations) { ExtractAnnotations task ->
-                task.outputs.doNotCacheIf("Has absolute source", Specs.SATISFIES_ALL)
+                def originalValue = task.source
+                task.source = []
+                task.inputs.files(originalValue)
+                    .withPathSensitivity(PathSensitivity.RELATIVE)
+                    .withPropertyName("source.workaround")
+                    .skipWhenEmpty(true)
+
+                task.doFirst {
+                    task.source = originalValue
+                }
             }
         }
     }

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

@@ -108,6 +108,9 @@ class VersionCheckTest extends Specification {
             result.task(":library:compileReleaseRenderscript").outcome == FROM_CACHE
             result.task(":library:compileReleaseShaders").outcome == FROM_CACHE
             result.task(":library:compileReleaseShaders").outcome == FROM_CACHE
+            result.task(":library:extractDebugAnnotations").outcome == FROM_CACHE
+            // TODO This produces overlapping outputs in build/intermediates/typedefs.txt
+            // result.task(":library:extractReleaseAnnotations").outcome == FROM_CACHE
             result.task(":library:generateDebugBuildConfig").outcome == FROM_CACHE
             result.task(":library:generateDebugResValues").outcome == FROM_CACHE
             result.task(":library:generateDebugResValues").outcome == FROM_CACHE
@@ -140,7 +143,7 @@ class VersionCheckTest extends Specification {
 
         where:
         // [gradleVersion, androidVersion] << GroovyCollections.combinations(Versions.SUPPORTED_GRADLE_VERSIONS, Versions.SUPPORTED_ANDROID_VERSIONS)
-        gradleVersion = GradleVersion.version("4.1")
+        gradleVersion = GradleVersion.version("4.3")
         androidVersion = VersionNumber.parse("3.0.0")
     }