Fix issues with removing non-latest patch versions

Author: ghale

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

@@ -39,7 +39,7 @@ class AndroidCacheFixPlugin implements Plugin<Project> {
     // some of the classes the workarounds reference.  In such a case, we can throw a friendlier "not supported"
     // error instead of a ClassDefNotFound.
     static {
-        if (isSupportedAndroidVersion()) {
+        if (isMaybeSupportedAndroidVersion()) {
             WORKAROUNDS.addAll(
                 new MergeJavaResourcesWorkaround(),
                 new MergeNativeLibsWorkaround(),
@@ -55,7 +55,7 @@ class AndroidCacheFixPlugin implements Plugin<Project> {
 
     private static boolean isMaybeSupportedAndroidVersion() {
         return Boolean.getBoolean(IGNORE_VERSION_CHECK_PROPERTY) ||
-            (CURRENT_ANDROID_VERSION < SUPPORTED_ANDROID_VERSIONS.max() && CURRENT_ANDROID_VERSION > SUPPORTED_ANDROID_VERSIONS.min())
+            (CURRENT_ANDROID_VERSION <= Versions.latestAndroidVersion() && CURRENT_ANDROID_VERSION >= Versions.earliestMaybeSupportedAndroidVersion())
     }
 
     @Override

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

@@ -11,8 +11,6 @@ import org.gradle.util.VersionNumber
 
 @CompileStatic(TypeCheckingMode.SKIP)
 class Versions {
-    public static final String OMIT_VERSION_PROPERTY = "org.gradle.android.cache-fix.omitVersion"
-
     static final VersionNumber PLUGIN_VERSION;
     static final Set<GradleVersion> SUPPORTED_GRADLE_VERSIONS
     static final Set<VersionNumber> SUPPORTED_ANDROID_VERSIONS
@@ -24,9 +22,7 @@ class Versions {
 
         def builder = ImmutableMultimap.<VersionNumber, GradleVersion>builder()
         versions.supportedVersions.each { String androidVersion, List<String> gradleVersions ->
-            if (!shouldOmitVersion(androidVersion)) {
-                builder.putAll(android(androidVersion), gradleVersions.collect { gradle(it) })
-            }
+            builder.putAll(android(androidVersion), gradleVersions.collect { gradle(it) })
         }
         def matrix = builder.build()
 
@@ -35,10 +31,6 @@ class Versions {
         SUPPORTED_GRADLE_VERSIONS = ImmutableSortedSet.copyOf(matrix.values())
     }
 
-    private static boolean shouldOmitVersion(String androidVersion) {
-        return System.getProperty(OMIT_VERSION_PROPERTY) == androidVersion
-    }
-
     static VersionNumber android(String version) {
         VersionNumber.parse(version)
     }
@@ -47,6 +39,11 @@ class Versions {
         GradleVersion.version(version)
     }
 
+    static VersionNumber earliestMaybeSupportedAndroidVersion() {
+        VersionNumber earliestSupported = SUPPORTED_ANDROID_VERSIONS.min()
+        return new VersionNumber(earliestSupported.major, earliestSupported.minor, 0, null)
+    }
+
     static VersionNumber latestAndroidVersion() {
         return SUPPORTED_ANDROID_VERSIONS.max()
     }

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

@@ -13,14 +13,9 @@ class WorkaroundTest extends Specification {
         where:
         androidVersion  | expectedWorkarounds
         "4.2.0-alpha04" | ['RoomSchemaLocation', 'CompileLibraryResources']
-        "4.1.0-beta04" | ['RoomSchemaLocation', 'CompileLibraryResources']
-        "4.0.0"         | ['MergeJavaResources', 'MergeNativeLibs', 'RoomSchemaLocation', 'CompileLibraryResources']
-        "3.6.2"         | ['MergeJavaResources', 'MergeNativeLibs', 'RoomSchemaLocation']
-        "3.6.1"         | ['MergeJavaResources', 'MergeNativeLibs', 'RoomSchemaLocation']
-        "3.6.0"         | ['MergeJavaResources', 'MergeNativeLibs', 'RoomSchemaLocation']
-        "3.5.3"         | ['MergeJavaResources', 'RoomSchemaLocation']
-        "3.5.2"         | ['MergeJavaResources', 'RoomSchemaLocation']
-        "3.5.1"         | ['MergeJavaResources', 'RoomSchemaLocation']
-        "3.5.0"         | ['MergeJavaResources', 'RoomSchemaLocation']
+        "4.1.0-beta03" | ['RoomSchemaLocation', 'CompileLibraryResources']
+        "4.0.1"         | ['MergeJavaResources', 'MergeNativeLibs', 'RoomSchemaLocation', 'CompileLibraryResources']
+        "3.6.4"         | ['MergeJavaResources', 'MergeNativeLibs', 'RoomSchemaLocation']
+        "3.5.4"         | ['MergeJavaResources', 'RoomSchemaLocation']
     }
 }