Remove non-latest patch versions to limit testing overhead

Author: ghale

build.gradle

@@ -25,17 +25,8 @@ def supportedVersions = [
     "4.2.0-alpha04": ["6.5.1"],
     "4.1.0-beta03": ["6.5.1"],
     "4.0.1": ["6.1.1", "6.3", "6.4.1"],
-    "4.0.0": ["6.1.1"],
     "3.6.4": ["5.6.4", "6.3", "6.4.1"],
-    "3.6.3": ["5.6.4"],
-    "3.6.2": ["5.6.4"],
-    "3.6.1": ["5.6.4"],
-    "3.6.0": ["5.6.4"],
-    "3.5.4": ["5.4.1", "5.6.4", "6.3", "6.4.1"],
-    "3.5.3": ["5.4.1"],
-    "3.5.2": ["5.4.1"],
-    "3.5.1": ["5.4.1"],
-    "3.5.0": ["5.4.1"]
+    "3.5.4": ["5.4.1", "5.6.4", "6.3", "6.4.1"]
 ]
 
 repositories {

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

@@ -62,7 +62,7 @@ class AndroidCacheFixPlugin implements Plugin<Project> {
     void apply(Project project) {
         if (!isSupportedAndroidVersion()) {
             if (isMaybeSupportedAndroidVersion()) {
-                project.logger.warn("WARNING: Android plugin ${CURRENT_ANDROID_VERSION} has not been tested with this version of the Android cache fix plugin, although it may work.  This is likely because it is newly released and we haven't had a chance to release a new version of Android cache fix that supports it.  Proceed with caution.  You can suppress this warning with with -D${IGNORE_VERSION_CHECK_PROPERTY}=true.")
+                project.logger.warn("WARNING: Android plugin ${CURRENT_ANDROID_VERSION} has not been tested with this version of the Android cache fix plugin, although it may work.  We test against only the latest patch release versions of Android Gradle plugin: ${SUPPORTED_ANDROID_VERSIONS.join(", ")}.  If ${CURRENT_ANDROID_VERSION} is newly released, we may not have had a chance to release a version tested against it yet.  Proceed with caution.  You can suppress this warning with with -D${IGNORE_VERSION_CHECK_PROPERTY}=true.")
             } else {
                 throw new RuntimeException("Android plugin ${CURRENT_ANDROID_VERSION} is not supported by Android cache fix plugin. Supported Android plugin versions: ${SUPPORTED_ANDROID_VERSIONS.join(", ")}. Override with -D${IGNORE_VERSION_CHECK_PROPERTY}=true.")
             }

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

@@ -27,20 +27,18 @@ class PluginApplicationTest extends AbstractTest {
 
     }
 
-    // Temporarily ignored until we come up with a better way of testing this that doesn't introduce flakiness
-    @Ignore
     def "warns when version is not supported but within range"() {
         def projectDir = temporaryFolder.newFolder()
         SimpleAndroidApp.builder(projectDir, cacheDir)
-            .withAndroidVersion("3.6.3")
+            .withAndroidVersion("3.6.1")
             .build()
             .writeProject()
 
         expect:
         def result = withGradleVersion(Versions.latestGradleVersion().version)
             .withProjectDir(projectDir)
-            .withArguments("tasks", "--stacktrace", "-D${Versions.OMIT_VERSION_PROPERTY}=3.6.3")
+            .withArguments("tasks", "--stacktrace")
             .build()
-        result.output =~ /WARNING: Android plugin ${quote("3.6.3")} has not been tested with this version of the Android cache fix plugin, although it may work.  This is likely because it is newly released and we haven't had a chance to release a new version of Android cache fix that supports it.  Proceed with caution.  You can suppress this warning with with -Dorg.gradle.android.cache-fix.ignoreVersionCheck=true./
+        result.output =~ /WARNING: Android plugin ${quote("3.6.1")} has not been tested with this version of the Android cache fix plugin, although it may work.  We test against only the latest patch release versions of Android Gradle plugin: ${Versions.SUPPORTED_ANDROID_VERSIONS.join(", ")}.  If 3.6.1 is newly released, we may not have had a chance to release a version tested against it yet.  Proceed with caution.  You can suppress this warning with with -Dorg.gradle.android.cache-fix.ignoreVersionCheck=true./
     }
 }