Merge pull request #40 from gradle/lptr/support-android-3.1.0-beta2

Support Android 3.1.0-beta2

Author: lptr

README.md

@@ -4,8 +4,8 @@
 
 Some Android plugin versions have issues with Gradle's build cache feature. When applied to an Android project this plugin applies workarounds for these issues based on the Android plugin and Gradle versions.
 
-* Supported Gradle versions: all versions between 4.1 and 4.5.1
-* Supported Android versions: 3.0.0, 3.0.1, 3.1.0-beta1, 3.2.0-alpha01
+* Supported Gradle versions: 4.1+
+* Supported Android versions: 3.0.0, 3.0.1, 3.1.0-beta2, 3.2.0-alpha01
 
 **Note:** With Android 3.1.x and 3.2.x the cache-fix plugin is only required if you are using Android's data binding feature.
 

build.gradle

@@ -23,7 +23,7 @@ version = ["git", "describe", "--match", "[0-9]*", "--dirty"].execute().text.tri
 // Maps supported Android plugin versions to the versions of Gradle that support it
 def supportedVersions = [
     "3.2.0-alpha01": ["4.5", "4.5.1"],
-    "3.1.0-beta1": ["4.4", "4.4.1", "4.5", "4.5.1"],
+    "3.1.0-beta2": ["4.4", "4.4.1", "4.5", "4.5.1"],
     "3.0.0": ["4.1", "4.2", "4.2.1", "4.3", "4.3.1", "4.4", "4.4.1", "4.5", "4.5.1"],
     "3.0.1": ["4.1", "4.2", "4.2.1", "4.3", "4.3.1", "4.4", "4.4.1", "4.5", "4.5.1"],
 ]

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

@@ -18,7 +18,6 @@ import org.gradle.api.tasks.PathSensitivity
 import org.gradle.api.tasks.util.PatternFilterable
 import org.gradle.internal.Factory
 import org.gradle.util.DeprecationLogger
-import org.gradle.util.GradleVersion
 import org.gradle.util.VersionNumber
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
@@ -47,16 +46,12 @@ class AndroidCacheFixPlugin implements Plugin<Project> {
 
     @Override
     void apply(Project project) {
-        def currentGradleVersion = GradleVersion.current()
         def currentAndroidVersion = android(Version.ANDROID_GRADLE_PLUGIN_VERSION)
 
         if (!Boolean.getBoolean(IGNORE_VERSION_CHECK_PROPERTY)) {
             if (!Versions.SUPPORTED_ANDROID_VERSIONS.contains(currentAndroidVersion)) {
                 throw new RuntimeException("Android plugin $currentAndroidVersion is not supported by Android cache fix plugin. Supported Android plugin versions: ${Versions.SUPPORTED_ANDROID_VERSIONS.join(", ")}. Override with -D${IGNORE_VERSION_CHECK_PROPERTY}=true.")
             }
-            if (!Versions.SUPPORTED_GRADLE_VERSIONS*.baseVersion.contains(currentGradleVersion.baseVersion)) {
-                throw new RuntimeException("$currentGradleVersion is not supported by Android cache fix plugin. Supported Gradle versions: ${Versions.SUPPORTED_GRADLE_VERSIONS*.version.join(", ")}. Override with -D${IGNORE_VERSION_CHECK_PROPERTY}=true.")
-            }
         }
 
         def context = new WorkaroundContext(project, new CompilerArgsProcessor(project))

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

@@ -1,6 +1,7 @@
 package org.gradle.android
 
 import com.google.common.collect.ImmutableMultimap
+import com.google.common.collect.ImmutableSortedSet
 import com.google.common.collect.Multimap
 import groovy.json.JsonSlurper
 import groovy.transform.CompileStatic
@@ -26,8 +27,8 @@ class Versions {
         def matrix = builder.build()
 
         SUPPORTED_VERSIONS_MATRIX = matrix
-        SUPPORTED_ANDROID_VERSIONS = matrix.keySet()
-        SUPPORTED_GRADLE_VERSIONS = (matrix.values() as Set)
+        SUPPORTED_ANDROID_VERSIONS = ImmutableSortedSet.copyOf(matrix.keySet())
+        SUPPORTED_GRADLE_VERSIONS = ImmutableSortedSet.copyOf(matrix.values())
     }
 
     static VersionNumber android(String version) {

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

@@ -1,32 +1,18 @@
 package org.gradle.android
 
+import org.gradle.internal.impldep.com.google.common.collect.Iterables
 import spock.lang.Unroll
 
 import static java.util.regex.Pattern.quote
 
 class PluginApplicationTest extends AbstractTest {
 
-    @Unroll
-    def "does not apply workarounds with Gradle #gradleVersion"() {
-        def projectDir = temporaryFolder.newFolder()
-        new SimpleAndroidApp(projectDir, cacheDir, "3.0.0", true).writeProject()
-        expect:
-        def result = withGradleVersion(gradleVersion)
-            .withProjectDir(projectDir)
-            .withArguments("tasks")
-            .buildAndFail()
-        result.output =~ /Gradle ${quote(gradleVersion)} is not supported by Android cache fix plugin. Supported Gradle versions: .*. Override with -Dorg.gradle.android.cache-fix.ignoreVersionCheck=true./
-
-        where:
-        gradleVersion << ["4.6-20180111235836+0000"]
-    }
-
     @Unroll
     def "does not apply workarounds with Android #androidVersion"() {
         def projectDir = temporaryFolder.newFolder()
         new SimpleAndroidApp(projectDir, cacheDir, androidVersion, true).writeProject()
         expect:
-        def result = withGradleVersion("4.1")
+        def result = withGradleVersion(Iterables.getLast(Versions.SUPPORTED_GRADLE_VERSIONS).version)
             .withProjectDir(projectDir)
             .withArguments("tasks")
             .buildAndFail()
@@ -43,7 +29,7 @@ class PluginApplicationTest extends AbstractTest {
         def message = "WARNING: Android cache-fix plugin is not required when using Android plugin $androidVersion or later, unless Android data binding is used."
 
         expect:
-        def result = withGradleVersion("4.5.1")
+        def result = withGradleVersion(Iterables.getLast(Versions.SUPPORTED_GRADLE_VERSIONS).version)
             .withProjectDir(projectDir)
             .withArguments("tasks")
             .withDebug(true)
@@ -60,8 +46,10 @@ class PluginApplicationTest extends AbstractTest {
         false | false       | "3.0.0"
         false | true        | "3.0.1"
         false | false       | "3.0.1"
-        false | true        | "3.1.0-beta1"
-        true  | false       | "3.1.0-beta1"
+        false | true        | "3.1.0-beta2"
+        true  | false       | "3.1.0-beta2"
+        false | true        | "3.2.0-alpha01"
+        true  | false       | "3.2.0-alpha01"
         description = warns ? "warn" : "not warn"
     }
 }

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

@@ -24,6 +24,7 @@ class WorkaroundTest extends Specification {
         "3.1.0-alpha08" | ["DataBindingDependencyArtifacts"]
         "3.1.0-alpha09" | ["DataBindingDependencyArtifacts"]
         "3.1.0-beta1"   | ["DataBindingDependencyArtifacts"]
+        "3.1.0-beta2"   | ["DataBindingDependencyArtifacts"]
         "3.2.0-alpha01" | ["DataBindingDependencyArtifacts"]
     }
 }