Merge pull request #278 from gradle/no/update-non-cacheable

Remove workaround for already non-cacheable tasks.

Author: ghale

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

@@ -9,7 +9,6 @@ import org.gradle.android.workarounds.CompileLibraryResourcesWorkaround
 import org.gradle.android.workarounds.CompilerArgsProcessor
 import org.gradle.android.workarounds.DataBindingMergeDependencyArtifactsWorkaround
 import org.gradle.android.workarounds.LibraryJniLibsWorkaround
-import org.gradle.android.workarounds.MergeJavaResourcesWorkaround
 import org.gradle.android.workarounds.MergeNativeLibsWorkaround
 
 import org.gradle.android.workarounds.MergeSourceSetFoldersWorkaround
@@ -39,7 +38,6 @@ class AndroidCacheFixPlugin implements Plugin<Project> {
         // error instead of a ClassDefNotFound.
         if (isMaybeSupportedAndroidVersion(project)) {
             return Arrays.<Workaround>asList(
-                new MergeJavaResourcesWorkaround(),
                 new MergeNativeLibsWorkaround(),
                 new MergeSourceSetFoldersWorkaround(),
                 new RoomSchemaLocationWorkaround(),

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

@@ -10,7 +10,7 @@ import org.gradle.api.Project
  * Disables caching of the BundleLibraryClassesJar and BundleLibraryClassesDir tasks which are mostly disk bound and
  * unlikely to provide positive performance benefits.
  */
-@AndroidIssue(introducedIn = "4.1.0", fixedIn = [], link = "https://issuetracker.google.com/issues/199763362")
+@AndroidIssue(introducedIn = "4.1.0", fixedIn = "7.2.0-alpha06", link = "https://issuetracker.google.com/issues/199763362")
 @CompileStatic
 class BundleLibraryClassesWorkaround implements Workaround {
     private static final String CACHING_ENABLED_PROPERTY = "org.gradle.android.cache-fix.BundleLibraryClasses.caching.enabled"

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

@@ -10,7 +10,7 @@ import org.gradle.api.Task
  * Disables caching of the DataBindingMergeDependencyArtifactsTask task which is mostly disk bound and
  * unlikely to provide positive performance benefits.
  */
-@AndroidIssue(introducedIn = "3.5.0", fixedIn = [], link = "https://issuetracker.google.com/issues/200002454")
+@AndroidIssue(introducedIn = "3.5.0", fixedIn = "7.2.0-alpha06", link = "https://issuetracker.google.com/issues/200002454")
 @CompileStatic
 class DataBindingMergeDependencyArtifactsWorkaround implements Workaround {
     private static final String CACHING_ENABLED_PROPERTY = "org.gradle.android.cache-fix.DataBindingMergeDependencyArtifacts.caching.enabled"

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

@@ -10,7 +10,7 @@ import org.gradle.api.Task;
  * Disables caching of the LibraryJniLibsTask task which is mostly disk bound and
  * unlikely to provide positive performance benefits.
  */
-@AndroidIssue(introducedIn = "3.6.0", fixedIn = [], link = "https://issuetracker.google.com/issues/200002454")
+@AndroidIssue(introducedIn = "3.6.0", fixedIn = "7.2.0-alpha06", link = "https://issuetracker.google.com/issues/200002454")
 @CompileStatic
 class LibraryJniLibsWorkaround implements Workaround {
 

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

@@ -10,7 +10,7 @@ import org.gradle.api.Task
  * Disables caching of the StripDebugSymbols task which is mostly disk bound and unlikely to provide positive
  * performance benefits.
  */
-@AndroidIssue(introducedIn = "3.5.0", fixedIn = [], link = "https://issuetracker.google.com/issues/181143775")
+@AndroidIssue(introducedIn = "3.5.0", fixedIn = "7.2.0-alpha06", link = "https://issuetracker.google.com/issues/181143775")
 @CompileStatic
 class StripDebugSymbolsWorkaround implements Workaround {
     private static final String CACHING_ENABLED_PROPERTY = "org.gradle.android.cache-fix.StripDebugSymbols.caching.enabled"

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

@@ -12,9 +12,9 @@ class WorkaroundTest extends Specification {
         workarounds.collect { it.class.simpleName.replaceAll(/Workaround/, "") }.sort() == expectedWorkarounds.sort()
         where:
         androidVersion  | expectedWorkarounds
-        "7.3.0-alpha07" | ['ZipMergingTask', 'LibraryJniLibs', 'DataBindingMergeDependencyArtifacts', 'BundleLibraryClasses', 'MergeSourceSetFolders', 'MergeJavaResources', 'RoomSchemaLocation', 'StripDebugSymbols', 'MergeNativeLibs', 'CompileLibraryResources']
-        "7.2.0-beta04" | ['ZipMergingTask', 'LibraryJniLibs', 'DataBindingMergeDependencyArtifacts', 'BundleLibraryClasses', 'MergeSourceSetFolders', 'MergeJavaResources', 'RoomSchemaLocation', 'StripDebugSymbols', 'MergeNativeLibs', 'CompileLibraryResources']
-        "7.1.3"  | ['ZipMergingTask', 'LibraryJniLibs', 'DataBindingMergeDependencyArtifacts', 'BundleLibraryClasses', 'MergeSourceSetFolders', 'MergeJavaResources', 'RoomSchemaLocation', 'StripDebugSymbols', 'MergeNativeLibs', 'CompileLibraryResources']
-        "7.0.4"         | ['ZipMergingTask', 'LibraryJniLibs', 'DataBindingMergeDependencyArtifacts', 'BundleLibraryClasses', 'MergeSourceSetFolders', 'MergeJavaResources', 'RoomSchemaLocation', 'StripDebugSymbols', 'MergeNativeLibs', 'CompileLibraryResources']
+        "7.3.0-alpha07" | ['ZipMergingTask', 'LibraryJniLibs', 'DataBindingMergeDependencyArtifacts', 'BundleLibraryClasses', 'MergeSourceSetFolders', 'RoomSchemaLocation', 'StripDebugSymbols', 'MergeNativeLibs', 'CompileLibraryResources']
+        "7.2.0-beta04" | ['ZipMergingTask', 'LibraryJniLibs', 'DataBindingMergeDependencyArtifacts', 'BundleLibraryClasses', 'MergeSourceSetFolders', 'RoomSchemaLocation', 'StripDebugSymbols', 'MergeNativeLibs', 'CompileLibraryResources']
+        "7.1.3"  | ['ZipMergingTask', 'LibraryJniLibs', 'DataBindingMergeDependencyArtifacts', 'BundleLibraryClasses', 'MergeSourceSetFolders', 'RoomSchemaLocation', 'StripDebugSymbols', 'MergeNativeLibs', 'CompileLibraryResources']
+        "7.0.4"         | ['ZipMergingTask', 'LibraryJniLibs', 'DataBindingMergeDependencyArtifacts', 'BundleLibraryClasses', 'MergeSourceSetFolders', 'RoomSchemaLocation', 'StripDebugSymbols', 'MergeNativeLibs', 'CompileLibraryResources']
     }
 }