Merge pull request #116 from runningcode/no/dex-file-dependencies

Make DexFileDependencies cacheable

Author: ghale

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

@@ -9,6 +9,7 @@ import com.google.common.collect.ImmutableList
 import groovy.transform.CompileStatic
 import org.gradle.android.workarounds.CompileLibraryResourcesWorkaround
 import org.gradle.android.workarounds.CompilerArgsProcessor
+import org.gradle.android.workarounds.DexFileDependenciesWorkaround
 import org.gradle.android.workarounds.MergeJavaResourcesWorkaround
 import org.gradle.android.workarounds.MergeNativeLibsWorkaround
 import org.gradle.android.workarounds.MergeResourcesWorkaround
@@ -46,7 +47,8 @@ class AndroidCacheFixPlugin implements Plugin<Project> {
                 new MergeNativeLibsWorkaround(),
                 new RoomSchemaLocationWorkaround(),
                 new CompileLibraryResourcesWorkaround(),
-                new MergeResourcesWorkaround()
+                new MergeResourcesWorkaround(),
+                new DexFileDependenciesWorkaround(),
             )
         }
     }

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

@@ -0,0 +1,21 @@
+package org.gradle.android.workarounds
+
+import com.android.build.gradle.internal.tasks.DexFileDependenciesTask
+import org.gradle.android.AndroidIssue
+import org.gradle.api.Project
+
+@AndroidIssue(introducedIn = "3.5.0", fixedIn = [], link = "https://issuetracker.google.com/160138798")
+class DexFileDependenciesWorkaround implements Workaround {
+    @Override
+    void apply(WorkaroundContext context) {
+        Project project = context.project
+        project.tasks.withType(DexFileDependenciesTask).configureEach {
+            outputs.cacheIf {true }
+        }
+    }
+
+    @Override
+    boolean canBeApplied(Project project) {
+        return true
+    }
+}

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

@@ -477,8 +477,7 @@ class CrossVersionOutcomeAndRelocationTest extends AbstractTest {
     }
 
     static void android42xOrHigherExpectations(ExpectedOutcomeBuilder builder) {
-        // Should be made cacheable: https://issuetracker.google.com/160138798
-        builder.expect(':app:desugarDebugFileDependencies', SUCCESS)
-        builder.expect(':app:desugarReleaseFileDependencies', SUCCESS)
+        builder.expect(':app:desugarDebugFileDependencies', FROM_CACHE)
+        builder.expect(':app:desugarReleaseFileDependencies', FROM_CACHE)
     }
 }

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

@@ -12,10 +12,10 @@ class WorkaroundTest extends Specification {
         workarounds.collect { it.class.simpleName.replaceAll(/Workaround/, "") }.sort() == expectedWorkarounds.sort()
         where:
         androidVersion  | expectedWorkarounds
-        "4.2.0-alpha07" | ['RoomSchemaLocation', 'CompileLibraryResources', 'MergeResources']
-        "4.1.0-rc01"  | ['RoomSchemaLocation', 'CompileLibraryResources', 'MergeResources']
-        "4.0.1"         | ['MergeJavaResources', 'MergeNativeLibs', 'RoomSchemaLocation', 'CompileLibraryResources', 'MergeResources']
-        "3.6.4"         | ['MergeJavaResources', 'MergeNativeLibs', 'RoomSchemaLocation']
-        "3.5.4"         | ['MergeJavaResources', 'RoomSchemaLocation']
+        "4.2.0-alpha07" | ['RoomSchemaLocation', 'CompileLibraryResources', 'MergeResources', 'DexFileDependencies']
+        "4.1.0-rc01"  | ['RoomSchemaLocation', 'CompileLibraryResources', 'MergeResources', 'DexFileDependencies']
+        "4.0.1"         | ['MergeJavaResources', 'MergeNativeLibs', 'RoomSchemaLocation', 'CompileLibraryResources', 'MergeResources', 'DexFileDependencies']
+        "3.6.4"         | ['MergeJavaResources', 'MergeNativeLibs', 'RoomSchemaLocation', 'DexFileDependencies']
+        "3.5.4"         | ['MergeJavaResources', 'RoomSchemaLocation', 'DexFileDependencies']
     }
 }