Merge pull request #96 from gradle/runningcode/4.1

Update to 4.1.0-beta01

Author: ghale

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: 5.4.1+
-* Supported Android versions: 3.5.0, 3.5.1, 3.5.2, 3.5.3, 3.6.0, 3.6.1, 3.6.2, 3.6.3, 4.0
+* Supported Android versions: 3.5.0, 3.5.1, 3.5.2, 3.5.3, 3.6.0, 3.6.1, 3.6.2, 3.6.3, 4.0, 4.1-beta01
 * Supported Kotlin versions: 1.3.70+
 
 ## Applying the plugin

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 = [
     // 4.1.0-alpha10 is *only* compatible with milestone 1
-    "4.1.0-alpha10": ["6.5-milestone-1"],
+    "4.1.0-beta01": ["6.5"],
     "4.0.0": ["6.1.1", "6.3", "6.4.1"],
     "3.6.3": ["5.6.4", "6.3", "6.4.1"],
     "3.6.2": ["5.6.4"],

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

@@ -251,7 +251,6 @@ class CrossVersionOutcomeAndRelocationTest extends AbstractTest {
         builder.expect(':app:preBuild', UP_TO_DATE)
         builder.expect(':app:preDebugBuild', UP_TO_DATE)
         builder.expect(':app:preReleaseBuild', UP_TO_DATE)
-        builder.expect(':app:prepareLintJar', SUCCESS)
         builder.expect(':app:processDebugJavaRes', NO_SOURCE)
         builder.expect(':app:processDebugManifest', FROM_CACHE)
         builder.expect(':app:processReleaseJavaRes', NO_SOURCE)
@@ -365,6 +364,7 @@ class CrossVersionOutcomeAndRelocationTest extends AbstractTest {
         builder.expect(':library:generateDebugSources', SUCCESS)
         builder.expect(':library:generateReleaseSources', SUCCESS)
         builder.expect(':library:prepareLintJar', SUCCESS)
+        builder.expect(':app:prepareLintJar', SUCCESS)
     }
 
     static void android35xOnlyExpectations(ExpectedOutcomeBuilder builder) {
@@ -463,6 +463,10 @@ class CrossVersionOutcomeAndRelocationTest extends AbstractTest {
         builder.expect(':app:compressReleaseAssets', FROM_CACHE)
         builder.expect(':app:mergeDebugNativeDebugMetadata', NO_SOURCE)
         builder.expect(':app:mergeReleaseNativeDebugMetadata', NO_SOURCE)
+        builder.expect(':app:checkDebugAarMetadata', FROM_CACHE)
+        builder.expect(':app:checkReleaseAarMetadata', FROM_CACHE)
+        builder.expect(':library:writeDebugAarMetadata', FROM_CACHE)
+        builder.expect(':library:writeReleaseAarMetadata', FROM_CACHE)
     }
 
     static void android40xOnlyExpectations(ExpectedOutcomeBuilder builder) {

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

@@ -23,7 +23,7 @@ class PluginApplicationTest extends AbstractTest {
         result.output =~ /Android plugin ${quote(androidVersion)} is not supported by Android cache fix plugin. Supported Android plugin versions: .*. Override with -Dorg.gradle.android.cache-fix.ignoreVersionCheck=true./
 
         where:
-        androidVersion << ["3.4.1"] // TODO https://github.com/gradle/android-cache-fix-gradle-plugin/issues/95 Add 4.2.x when released.
+        androidVersion << ["3.4.1", "4.2.0-alpha01"]
 
     }