Merge pull request #26 from gradle/lptr/support-android-3.1.0-alpha06

Support Android 3.1.0-alpha06
gradle · Dec 20, 2017 · 637532d · 637532d
2 parents 61d74ba + d057bca
commit 637532d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/build.gradle b/build.gradle
@@ -21,11 +21,10 @@ group = "org.gradle.android"
 version = ["git", "describe", "--match", "[0-9]*", "--dirty"].execute().text.trim()
 
 // Maps supported Android plugin versions to the versions of Gradle that support it
-def gradle441 = "4.4.1-20171218083510+0000"
 def supportedVersions = [
-    "3.1.0-alpha05": ["4.4", gradle441],
-    "3.0.0": ["4.1", "4.2", "4.2.1", "4.3", "4.3.1", "4.4", gradle441],
-    "3.0.1": ["4.1", "4.2", "4.2.1", "4.3", "4.3.1", "4.4", gradle441],
+    "3.1.0-alpha06": ["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"],
 ]
 
 repositories {

diff --git a/src/main/groovy/org/gradle/android/AndroidCacheFixPlugin.groovy b/src/main/groovy/org/gradle/android/AndroidCacheFixPlugin.groovy
@@ -88,7 +88,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", link = "https://issuetracker.google.com/issues/68392933")
+    @AndroidIssue(introducedIn = "3.0.0", fixedIn = "3.1.0-alpha06", link = "https://issuetracker.google.com/issues/68392933")
     static class AndroidJavaCompile_BootClasspath_Workaround implements Workaround {
         @CompileStatic(TypeCheckingMode.SKIP)
         @Override
@@ -114,7 +114,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", link = "https://issuetracker.google.com/issues/68391973")
+    @AndroidIssue(introducedIn = "3.0.0", fixedIn = "3.1.0-alpha06", link = "https://issuetracker.google.com/issues/68391973")
     static class AndroidJavaCompile_AnnotationProcessorSource_Workaround implements Workaround {
         @Override
         void apply(WorkaroundContext context) {
@@ -160,6 +160,7 @@ class AndroidCacheFixPlugin implements Plugin<Project> {
         void apply(WorkaroundContext context) {
             def project = context.project
             def compilerArgsProcessor = context.compilerArgsProcessor
+            compilerArgsProcessor.addRule(Skip.matching("-Aandroid.databinding.classLogFile=.*"))
             compilerArgsProcessor.addRule(Skip.matching("-Aandroid.databinding.sdkDir=.*"))
             compilerArgsProcessor.addRule(Skip.matching("-Aandroid.databinding.bindingBuildFolder=.*"))
             compilerArgsProcessor.addRule(Skip.matching("-Aandroid.databinding.xmlOutDir=.*"))

diff --git a/src/test/groovy/org/gradle/android/WorkaroundTest.groovy b/src/test/groovy/org/gradle/android/WorkaroundTest.groovy
@@ -19,5 +19,6 @@ class WorkaroundTest extends Specification {
         "3.1.0-alpha03" | ["AndroidJavaCompile_BootClasspath", "AndroidJavaCompile_AnnotationProcessorSource", "CombinedInput", "CheckManifest_Manifest", "DataBindingDependencyArtifacts"]
         "3.1.0-alpha04" | ["AndroidJavaCompile_BootClasspath", "AndroidJavaCompile_AnnotationProcessorSource", "CheckManifest_Manifest", "DataBindingDependencyArtifacts"]
         "3.1.0-alpha05" | ["AndroidJavaCompile_BootClasspath", "AndroidJavaCompile_AnnotationProcessorSource", "DataBindingDependencyArtifacts"]
+        "3.1.0-alpha06" | ["DataBindingDependencyArtifacts"]
     }
 }