From cf2e60a0ea28c779cec7c6f82d05f72dffe77c78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=B3r=C3=A1nt=20Pint=C3=A9r?= <lorant@gradle.com>
Date: Tue, 27 Mar 2018 15:42:50 +0200
Subject: [PATCH] Support Android 3.1.0

---
 README.md                                                     | 2 +-
 build.gradle                                                  | 2 +-
 .../groovy/org/gradle/android/PluginApplicationTest.groovy    | 4 ++--
 src/test/groovy/org/gradle/android/WorkaroundTest.groovy      | 1 +
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index a1ba6408..3c3679c1 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,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+
-* Supported Android versions: 3.0.0, 3.0.1, 3.1.0-rc03, 3.2.0-alpha01
+* Supported Android versions: 3.0.0, 3.0.1, 3.1.0, 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.
 
diff --git a/build.gradle b/build.gradle
index cd03d47a..8dfdb774 100644
--- a/build.gradle
+++ b/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.1", "4.6"],
-    "3.1.0-rc03": ["4.4.1", "4.5.1", "4.6"],
+    "3.1.0": ["4.4.1", "4.5.1", "4.6"],
     "3.0.0": ["4.1", "4.2.1", "4.3.1", "4.4.1", "4.5.1", "4.6"],
     "3.0.1": ["4.1", "4.2.1", "4.3.1", "4.4.1", "4.5.1", "4.6"],
 ]
diff --git a/src/test/groovy/org/gradle/android/PluginApplicationTest.groovy b/src/test/groovy/org/gradle/android/PluginApplicationTest.groovy
index fdb398ce..84936e2c 100644
--- a/src/test/groovy/org/gradle/android/PluginApplicationTest.groovy
+++ b/src/test/groovy/org/gradle/android/PluginApplicationTest.groovy
@@ -46,8 +46,8 @@ class PluginApplicationTest extends AbstractTest {
         false | false       | "3.0.0"
         false | true        | "3.0.1"
         false | false       | "3.0.1"
-        false | true        | "3.1.0-rc03"
-        true  | false       | "3.1.0-rc03"
+        false | true        | "3.1.0"
+        true  | false       | "3.1.0"
         false | true        | "3.2.0-alpha01"
         true  | false       | "3.2.0-alpha01"
         description = warns ? "warn" : "not warn"
diff --git a/src/test/groovy/org/gradle/android/WorkaroundTest.groovy b/src/test/groovy/org/gradle/android/WorkaroundTest.groovy
index f89c5b6e..5f30b799 100644
--- a/src/test/groovy/org/gradle/android/WorkaroundTest.groovy
+++ b/src/test/groovy/org/gradle/android/WorkaroundTest.groovy
@@ -30,6 +30,7 @@ class WorkaroundTest extends Specification {
         "3.1.0-rc01"    | ["DataBindingDependencyArtifacts"]
         "3.1.0-rc02"    | ["DataBindingDependencyArtifacts"]
         "3.1.0-rc03"    | ["DataBindingDependencyArtifacts"]
+        "3.1.0"         | ["DataBindingDependencyArtifacts"]
         "3.2.0-alpha01" | ["DataBindingDependencyArtifacts"]
     }
 }