Merge pull request #72 from gradle/lptr/support-android-3.2.0-beta01

Support Android 3.2.0-beta01

Author: lptr

build.gradle

@@ -22,7 +22,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-alpha18": ["4.8.1"],
+    "3.2.0-beta01": ["4.8.1"],
     "3.1.3": ["4.4.1", "4.5.1", "4.6", "4.7", "4.8.1"],
     "3.1.2": ["4.4.1"],
     "3.1.1": ["4.4.1"],

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

@@ -53,8 +53,8 @@ class PluginApplicationTest extends AbstractTest {
         false       | "3.1.2"              | "WARNING: Android cache-fix plugin is not required for project ':library' when using Android plugin 3.1.2 or later, unless Android data binding is used."
         true        | "3.1.3"              | null
         false       | "3.1.3"              | "WARNING: Android cache-fix plugin is not required for project ':library' when using Android plugin 3.1.3 or later, unless Android data binding is used."
-        true        | "3.2.0-alpha18"      | "WARNING: Android cache-fix plugin is not required for project ':library' when using Android plugin 3.2.0-alpha18 or later."
-        false       | "3.2.0-alpha18"      | "WARNING: Android cache-fix plugin is not required for project ':library' when using Android plugin 3.2.0-alpha18 or later."
+        true        | "3.2.0-beta01"       | "WARNING: Android cache-fix plugin is not required for project ':library' when using Android plugin 3.2.0-beta01 or later."
+        false       | "3.2.0-beta01"       | "WARNING: Android cache-fix plugin is not required for project ':library' when using Android plugin 3.2.0-beta01 or later."
         desc = message == null ? "does not print" : "prints"
     }
 }

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

@@ -86,7 +86,7 @@ class RelocationTest extends AbstractTest {
 
     private static ExpectedResults expectedResults(VersionNumber androidVersion, GradleVersion gradleVersion) {
         def isAndroid30x = androidVersion <= android("3.0.1")
-        def isAndroid32x = androidVersion >= android("3.2.0-alpha18")
+        def isAndroid32x = androidVersion >= android("3.2.0-beta01")
         def builder = ImmutableMap.<String, TaskOutcome>builder()
         builder.put(':app:assemble', SUCCESS)
         builder.put(':app:assembleDebug', SUCCESS)
@@ -177,8 +177,10 @@ class RelocationTest extends AbstractTest {
         builder.put(':library:assemble', SUCCESS)
         builder.put(':library:assembleDebug', SUCCESS)
         builder.put(':library:assembleRelease', SUCCESS)
-        builder.put(':library:bundleDebug', SUCCESS)
-        builder.put(':library:bundleRelease', SUCCESS)
+        if (!isAndroid32x) {
+            builder.put(':library:bundleDebug', SUCCESS)
+            builder.put(':library:bundleRelease', SUCCESS)
+        }
         builder.put(':library:checkDebugManifest', isAndroid30x
             ? FROM_CACHE
             : SUCCESS)

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

@@ -43,5 +43,6 @@ class WorkaroundTest extends Specification {
         "3.2.0-alpha07" | ["DataBindingDependencyArtifacts"]
         "3.2.0-alpha09" | ["DataBindingDependencyArtifacts"]
         "3.2.0-alpha18" | []
+        "3.2.0-beta01"  | []
     }
 }