Merge pull request #31 from gradle/lptr/support-gradle-4.5-rc-1

Support Gradle 4.5-rc-1

Author: lptr

README.md

@@ -4,7 +4,7 @@
 
 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: 4.1 to 4.4.1
+* Supported Gradle versions: 4.1 to 4.4.1, 4.5-rc-1
 * Supported Android versions: 3.0.0, 3.1.0-alpha07
 
 ## List of issues

build.gradle

@@ -22,9 +22,9 @@ 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.1.0-alpha07": ["4.4", "4.4.1"],
-    "3.0.0": ["4.1", "4.2", "4.2.1", "4.3", "4.3.1", "4.4", "4.4.1"],
-    "3.0.1": ["4.1", "4.2", "4.2.1", "4.3", "4.3.1", "4.4", "4.4.1"],
+    "3.1.0-alpha07": ["4.4", "4.4.1", "4.5-rc-1"],
+    "3.0.0": ["4.1", "4.2", "4.2.1", "4.3", "4.3.1", "4.4", "4.4.1", "4.5-rc-1"],
+    "3.0.1": ["4.1", "4.2", "4.2.1", "4.3", "4.3.1", "4.4", "4.4.1", "4.5-rc-1"],
 ]
 
 repositories {

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

@@ -18,7 +18,7 @@ class PluginApplicationTest extends AbstractTest {
         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.5-20171119235929+0000"]
+        gradleVersion << ["4.6-20180111235836+0000"]
     }
 
     @Unroll

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

@@ -56,8 +56,7 @@ class RelocationTest extends AbstractTest {
         relocatedDir.deleteDir()
 
         where:
-        //[androidVersion, gradleVersion] << Versions.SUPPORTED_VERSIONS_MATRIX.entries().collect { [it.key, it.value] }
-        [androidVersion, gradleVersion] << [[android("3.1.0-alpha07"), gradle("4.4.1")]]
+        [androidVersion, gradleVersion] << Versions.SUPPORTED_VERSIONS_MATRIX.entries().collect { [it.key, it.value] }
     }
 
     static class ExpectedResults {