Merge pull request #119 from runningcode/no/4.2-alpha

Updates for 4.2 alpha

Author: ghale

build.gradle

@@ -12,8 +12,8 @@ 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 = [
-    "4.2.0-alpha07": ["6.5.1"],
-    "4.1.0-rc01": ["6.5.1"],
+    "4.2.0-alpha10": ["6.6.1"],
+    "4.1.0-rc02": ["6.5.1"],
     "4.0.1": ["6.1.1", "6.3", "6.4.1"],
     "3.6.4": ["5.6.4", "6.3", "6.4.1"],
     "3.5.4": ["5.4.1", "5.6.4", "6.3", "6.4.1"]

gradle/buildScanInit.gradle

@@ -3,7 +3,7 @@ import com.gradle.scan.plugin.BuildScanPlugin
 import org.gradle.util.GradleVersion
 
 initscript {
-    def pluginVersion = "3.3.3"
+    def pluginVersion = "3.4.1"
 
     repositories {
         gradlePluginPortal()

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

@@ -7,12 +7,13 @@ import com.android.build.gradle.tasks.ProcessAndroidResources
 import com.android.builder.model.Version
 import com.google.common.collect.ImmutableList
 import groovy.transform.CompileStatic
-import org.gradle.android.workarounds.CompileLibraryResourcesWorkaround
+import org.gradle.android.workarounds.CompileLibraryResourcesWorkaround_4_0
 import org.gradle.android.workarounds.CompilerArgsProcessor
 import org.gradle.android.workarounds.DexFileDependenciesWorkaround
 import org.gradle.android.workarounds.MergeJavaResourcesWorkaround
 import org.gradle.android.workarounds.MergeNativeLibsWorkaround
 import org.gradle.android.workarounds.MergeResourcesWorkaround
+import org.gradle.android.workarounds.CompileLibraryResourcesWorkaround_4_2
 import org.gradle.android.workarounds.RoomSchemaLocationWorkaround
 import org.gradle.android.workarounds.Workaround
 import org.gradle.android.workarounds.WorkaroundContext
@@ -46,7 +47,8 @@ class AndroidCacheFixPlugin implements Plugin<Project> {
                 new MergeJavaResourcesWorkaround(),
                 new MergeNativeLibsWorkaround(),
                 new RoomSchemaLocationWorkaround(),
-                new CompileLibraryResourcesWorkaround(),
+                new CompileLibraryResourcesWorkaround_4_0(),
+                new CompileLibraryResourcesWorkaround_4_2(),
                 new MergeResourcesWorkaround(),
                 new DexFileDependenciesWorkaround(),
             )

src/main/groovy/org/gradle/android/workarounds/CompileLibraryResourcesWorkaround.groovy renamed to src/main/groovy/org/gradle/android/workarounds/CompileLibraryResourcesWorkaround_4_0.groovy

@@ -13,8 +13,8 @@ import java.lang.reflect.Field
  * Fixes the cacheability issue with CompileLibraryResourcesWorkaround where the mergedLibraryResourcesDir field is
  * treated as an input with absolute path sensitivity.
  */
-@AndroidIssue(introducedIn = "4.0.0", fixedIn = [], link = "https://issuetracker.google.com/issues/155218379")
-class CompileLibraryResourcesWorkaround implements Workaround {
+@AndroidIssue(introducedIn = "4.0.0", fixedIn = ["4.2.0-alpha09"], link = "https://issuetracker.google.com/issues/155218379")
+class CompileLibraryResourcesWorkaround_4_0 implements Workaround {
     // This task is new in AGP 4.0.0 so use Class.forName to allow for backward compatibility with older AGP versions.
     static Class<?> getAndroidTaskClass() {
         return Class.forName('com.android.build.gradle.tasks.CompileLibraryResourcesTask')

src/main/groovy/org/gradle/android/workarounds/CompileLibraryResourcesWorkaround_4_2.groovy

@@ -0,0 +1,64 @@
+package org.gradle.android.workarounds
+
+import org.gradle.android.AndroidIssue
+import org.gradle.api.Project
+import org.gradle.api.Task
+import org.gradle.api.file.ConfigurableFileCollection
+import org.gradle.api.tasks.PathSensitivity
+
+import java.lang.reflect.Field
+
+
+/**
+ * Fixes the cacheability issue with CompileLibraryResourcesWorkaround where the inputDirectories field is
+ * treated as an input with absolute path sensitivity.
+ * This is the same as the {@link CompileLibraryResourcesWorkaround_4_0} but the field was renamed with a new type
+ * in 4.2.0-alpha09.
+ */
+@AndroidIssue(introducedIn = "4.2.0-alpha09", fixedIn = [], link = "https://issuetracker.google.com/issues/155218379")
+class CompileLibraryResourcesWorkaround_4_2 implements Workaround {
+    // This task is new in AGP 4.0.0 so use Class.forName to allow for backward compatibility with older AGP versions.
+    static Class<?> getAndroidTaskClass() {
+        return Class.forName('com.android.build.gradle.tasks.CompileLibraryResourcesTask')
+    }
+
+    String propertyName = "inputDirectories"
+
+    public void setPropertyValue(Task task, ConfigurableFileCollection directoryProperty) {
+        Field field = task.class.getDeclaredFields().find { it.name == "__${propertyName}__" }
+        field.setAccessible(true)
+        field.set(task, directoryProperty)
+    }
+
+    @Override
+    void apply(WorkaroundContext context) {
+        Project project = context.project
+        project.tasks.withType(androidTaskClass).configureEach { Task task ->
+            ConfigurableFileCollection originalPropertyValue
+            // Create a synthetic input with the original property value and RELATIVE path sensitivity
+            project.gradle.taskGraph.beforeTask {
+                if (it == task) {
+                    originalPropertyValue = task.getProperty(propertyName)
+                    def dummyProperty = project.objects.fileCollection()
+                    // Non-existent file to give the ConfigurableFileCollection a value.
+                    dummyProperty.setFrom(project.file('/doesnt-exist'))
+                    setPropertyValue(task, dummyProperty)
+                    task.inputs.files(originalPropertyValue)
+                            .withPathSensitivity(PathSensitivity.RELATIVE)
+                            .withPropertyName("${propertyName}.workaround")
+                            .optional()
+                }
+            }
+            // Set the task property back to its original value
+            task.doFirst {
+                setPropertyValue(task, originalPropertyValue)
+            }
+        }
+    }
+
+    @Override
+    boolean canBeApplied(Project project) {
+        return true
+    }
+}
+

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

@@ -139,6 +139,7 @@ class CrossVersionOutcomeAndRelocationTest extends AbstractTest {
         def isAndroid36xOrHigher = androidVersion >= android("3.6.0")
         def isAndroid40xOrHigher = androidVersion >= android("4.0.0-beta01")
         def isAndroid40x = androidVersion >= android("4.0.0") && androidVersion < android("4.1.0-alpha01")
+        def isAndroid40xTo41x = androidVersion >= android("4.0.0") && androidVersion <= android("4.2.0-alpha01")
         def isAndroid41xOrHigher = androidVersion >= android("4.1.0-alpha01")
         def isAndroid42xOrHigher = androidVersion >= android("4.2.0-alpha01")
         def builder = new ExpectedOutcomeBuilder()
@@ -186,6 +187,10 @@ class CrossVersionOutcomeAndRelocationTest extends AbstractTest {
             android40xOnlyExpectations(builder)
         }
 
+        if (isAndroid40xTo41x) {
+            android40xTo41xExpectation(builder)
+        }
+
         // Applies to anything 4.1.0 or higher
         if (isAndroid41xOrHigher) {
             android41xOrHigherExpectations(builder)
@@ -443,13 +448,16 @@ class CrossVersionOutcomeAndRelocationTest extends AbstractTest {
         builder.expect(':library:bundleLibCompileToJarDebug', FROM_CACHE)
         builder.expect(':library:bundleLibResDebug', NO_SOURCE)
         builder.expect(':library:bundleLibResRelease', NO_SOURCE)
-        builder.expect(':library:bundleLibRuntimeToJarDebug', FROM_CACHE)
         builder.expect(':library:bundleLibCompileToJarRelease', FROM_CACHE)
-        builder.expect(':library:bundleLibRuntimeToJarRelease', FROM_CACHE)
         builder.expect(':app:collectReleaseDependencies', SUCCESS)
         builder.expect(':app:sdkReleaseDependencyData', SUCCESS)
     }
 
+    static void android40xTo41xExpectation(ExpectedOutcomeBuilder builder) {
+        builder.expect(':library:bundleLibRuntimeToJarDebug', FROM_CACHE)
+        builder.expect(':library:bundleLibRuntimeToJarRelease', FROM_CACHE)
+    }
+
     static void android41xOrHigherExpectations(ExpectedOutcomeBuilder builder) {
         builder.expect(':library:dataBindingTriggerDebug', FROM_CACHE)
         builder.expect(':library:dataBindingTriggerRelease', FROM_CACHE)
@@ -479,5 +487,12 @@ class CrossVersionOutcomeAndRelocationTest extends AbstractTest {
     static void android42xOrHigherExpectations(ExpectedOutcomeBuilder builder) {
         builder.expect(':app:desugarDebugFileDependencies', FROM_CACHE)
         builder.expect(':app:desugarReleaseFileDependencies', FROM_CACHE)
+        // Renamed from ToJar to ToDir
+        builder.expect(':library:bundleLibRuntimeToDirDebug', FROM_CACHE)
+        builder.expect(':library:bundleLibRuntimeToDirRelease', FROM_CACHE)
+        builder.expect(':app:optimizeReleaseResources', FROM_CACHE)
+        // New non-cacheable tasks in 4.2.0-alpha10:
+        builder.expect(':app:writeReleaseApplicationId', SUCCESS)
+        builder.expect(':app:analyticsRecordingRelease', SUCCESS)
     }
 }

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

@@ -12,9 +12,9 @@ class WorkaroundTest extends Specification {
         workarounds.collect { it.class.simpleName.replaceAll(/Workaround/, "") }.sort() == expectedWorkarounds.sort()
         where:
         androidVersion  | expectedWorkarounds
-        "4.2.0-alpha07" | ['RoomSchemaLocation', 'CompileLibraryResources', 'MergeResources', 'DexFileDependencies']
-        "4.1.0-rc01"  | ['RoomSchemaLocation', 'CompileLibraryResources', 'MergeResources', 'DexFileDependencies']
-        "4.0.1"         | ['MergeJavaResources', 'MergeNativeLibs', 'RoomSchemaLocation', 'CompileLibraryResources', 'MergeResources', 'DexFileDependencies']
+        "4.2.0-alpha10" | ['RoomSchemaLocation', 'CompileLibraryResources_4_2', 'MergeResources', 'DexFileDependencies']
+        "4.1.0-rc02"  | ['RoomSchemaLocation', 'CompileLibraryResources_4_0', 'MergeResources', 'DexFileDependencies']
+        "4.0.1"         | ['MergeJavaResources', 'MergeNativeLibs', 'RoomSchemaLocation', 'CompileLibraryResources_4_0', 'MergeResources', 'DexFileDependencies']
         "3.6.4"         | ['MergeJavaResources', 'MergeNativeLibs', 'RoomSchemaLocation', 'DexFileDependencies']
         "3.5.4"         | ['MergeJavaResources', 'RoomSchemaLocation', 'DexFileDependencies']
     }