Merge pull request #63 from gradle/lptr/support-android-3.1.2

Support Android 3.1.2

Author: lptr

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, 3.1.1, 3.2.0-alpha01
+* Supported Android versions: 3.0.0, 3.0.1, 3.1.0, 3.1.1, 3.1.2, 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

@@ -22,11 +22,12 @@ 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.1": ["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"],
+    "3.2.0-alpha01": ["4.5.1", "4.6", "4.7"],
+    "3.1.2": ["4.4.1", "4.5.1", "4.6", "4.7"],
+    "3.1.1": ["4.4.1"],
+    "3.1.0": ["4.4.1"],
+    "3.0.1": ["4.1", "4.2.1", "4.3.1", "4.4.1", "4.5.1", "4.6", "4.7"],
+    "3.0.0": ["4.1"],
 ]
 
 repositories {

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

@@ -92,7 +92,7 @@ class AndroidCacheFixPlugin implements Plugin<Project> {
     /**
      * Fix {@link org.gradle.api.tasks.compile.CompileOptions#getBootClasspath()} introducing relocatability problems for {@link AndroidJavaCompile}.
      */
-    @AndroidIssue(introducedIn = "3.0.0", fixedIn = ["3.1.0-alpha06", "3.1.1", "3.2.0-alpha01"], link = "https://issuetracker.google.com/issues/68392933")
+    @AndroidIssue(introducedIn = "3.0.0", fixedIn = ["3.1.0-alpha06", "3.1.1", "3.1.2", "3.2.0-alpha01"], link = "https://issuetracker.google.com/issues/68392933")
     static class AndroidJavaCompile_BootClasspath_Workaround implements Workaround {
         @CompileStatic(TypeCheckingMode.SKIP)
         @Override
@@ -118,7 +118,7 @@ class AndroidCacheFixPlugin implements Plugin<Project> {
     /**
      * Filter the Java annotation processor output folder from compiler arguments to avoid absolute path.
      */
-    @AndroidIssue(introducedIn = "3.0.0", fixedIn = ["3.1.0-alpha06", "3.1.1", "3.2.0-alpha01"], link = "https://issuetracker.google.com/issues/68391973")
+    @AndroidIssue(introducedIn = "3.0.0", fixedIn = ["3.1.0-alpha06", "3.1.1", "3.1.2", "3.2.0-alpha01"], link = "https://issuetracker.google.com/issues/68391973")
     static class AndroidJavaCompile_AnnotationProcessorSource_Workaround implements Workaround {
         @Override
         void apply(WorkaroundContext context) {
@@ -129,7 +129,7 @@ class AndroidCacheFixPlugin implements Plugin<Project> {
     /**
      * Override path sensitivity for {@link AndroidJavaCompile#getProcessorListFile()} to {@link PathSensitivity#NONE}.
      */
-    @AndroidIssue(introducedIn = "3.0.0", fixedIn = ["3.1.0-alpha01", "3.1.1", "3.2.0-alpha01"], link = "https://issuetracker.google.com/issues/68759178")
+    @AndroidIssue(introducedIn = "3.0.0", fixedIn = ["3.1.0-alpha01", "3.1.1", "3.1.2", "3.2.0-alpha01"], link = "https://issuetracker.google.com/issues/68759178")
     static class AndroidJavaCompile_ProcessorListFile_Workaround implements Workaround {
         @CompileStatic(TypeCheckingMode.SKIP)
         @Override
@@ -254,7 +254,7 @@ class AndroidCacheFixPlugin implements Plugin<Project> {
     /**
      * Override path sensitivity for {@link ExtractAnnotations#getSource()} to {@link PathSensitivity#RELATIVE}.
      */
-    @AndroidIssue(introducedIn = "3.0.0", fixedIn = ["3.1.0-alpha01", "3.1.1", "3.2.0-alpha01"], link = "https://issuetracker.google.com/issues/68759476")
+    @AndroidIssue(introducedIn = "3.0.0", fixedIn = ["3.1.0-alpha01", "3.1.1", "3.1.2", "3.2.0-alpha01"], link = "https://issuetracker.google.com/issues/68759476")
     static class ExtractAnnotations_Source_Workaround implements Workaround {
         @CompileStatic(TypeCheckingMode.SKIP)
         @Override
@@ -284,7 +284,7 @@ class AndroidCacheFixPlugin implements Plugin<Project> {
     /**
      * Fix {@link IncrementalTask#getCombinedInput()} and {@link StreamBasedTask#getCombinedInput()} relocatability.
      */
-    @AndroidIssue(introducedIn = "3.0.0", fixedIn = ["3.0.1", "3.1.0-alpha04", "3.1.1", "3.2.0-alpha01"], link = "https://issuetracker.google.com/issues/68771542")
+    @AndroidIssue(introducedIn = "3.0.0", fixedIn = ["3.0.1", "3.1.0-alpha04", "3.1.1", "3.1.2", "3.2.0-alpha01"], link = "https://issuetracker.google.com/issues/68771542")
     static class CombinedInput_Workaround implements Workaround {
         @CompileStatic(TypeCheckingMode.SKIP)
         @Override
@@ -316,7 +316,7 @@ class AndroidCacheFixPlugin implements Plugin<Project> {
     /**
      * {@link ProcessAndroidResources#getMergeBlameLogFolder()} shouldn't be an {@literal @}{@link org.gradle.api.tasks.Input}.
      */
-    @AndroidIssue(introducedIn = "3.0.0", fixedIn = ["3.0.1", "3.1.0-alpha02", "3.1.1", "3.2.0-alpha01"], link = "https://issuetracker.google.com/issues/68385486")
+    @AndroidIssue(introducedIn = "3.0.0", fixedIn = ["3.0.1", "3.1.0-alpha02", "3.1.1", "3.1.2", "3.2.0-alpha01"], link = "https://issuetracker.google.com/issues/68385486")
     static class ProcessAndroidResources_MergeBlameLogFolder_Workaround implements Workaround {
         @CompileStatic(TypeCheckingMode.SKIP)
         @Override
@@ -331,7 +331,7 @@ class AndroidCacheFixPlugin implements Plugin<Project> {
     /**
      * {@link com.android.build.gradle.internal.tasks.CheckManifest#getManifest()} should not be an {@literal @}{@link org.gradle.api.tasks.Input}.
      */
-    @AndroidIssue(introducedIn = "3.0.0", fixedIn = ["3.1.0-alpha05", "3.1.1", "3.2.0-alpha01"], link = "https://issuetracker.google.com/issues/68772035")
+    @AndroidIssue(introducedIn = "3.0.0", fixedIn = ["3.1.0-alpha05", "3.1.1", "3.1.2", "3.2.0-alpha01"], link = "https://issuetracker.google.com/issues/68772035")
     static class CheckManifest_Manifest_Workaround implements Workaround {
         @CompileStatic(TypeCheckingMode.SKIP)
         @Override

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

@@ -50,6 +50,8 @@ class PluginApplicationTest extends AbstractTest {
         true  | false       | "3.1.0"
         false | true        | "3.1.1"
         true  | false       | "3.1.1"
+        false | true        | "3.1.2"
+        true  | false       | "3.1.2"
         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

@@ -32,6 +32,7 @@ class WorkaroundTest extends Specification {
         "3.1.0-rc03"    | ["DataBindingDependencyArtifacts"]
         "3.1.0"         | ["DataBindingDependencyArtifacts"]
         "3.1.1"         | ["DataBindingDependencyArtifacts"]
+        "3.1.2"         | ["DataBindingDependencyArtifacts"]
         "3.2.0-alpha01" | ["DataBindingDependencyArtifacts"]
     }
 }