Merge pull request #122 from gradle/no/bump-latest

Support latest 4.2.0-alpha11 and 4.1.0-rc3

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-alpha10": ["6.6.1"],
-    "4.1.0-rc02": ["6.5.1"],
+    "4.2.0-alpha12": ["6.6.1"],
+    "4.1.0-rc03": ["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"]

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

@@ -141,6 +141,7 @@ class CrossVersionOutcomeAndRelocationTest extends AbstractTest {
         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 isandroid41x = androidVersion >= android("4.1.0-alpha01") && androidVersion < android("4.2.0-alpha01")
         def isAndroid42xOrHigher = androidVersion >= android("4.2.0-alpha01")
         def builder = new ExpectedOutcomeBuilder()
 
@@ -196,6 +197,10 @@ class CrossVersionOutcomeAndRelocationTest extends AbstractTest {
             android41xOrHigherExpectations(builder)
         }
 
+        if (isandroid41x) {
+            android41xOnlyExpectations(builder)
+        }
+
         if (isAndroid42xOrHigher) {
             android42xOrHigherExpectations(builder)
         }
@@ -470,13 +475,16 @@ class CrossVersionOutcomeAndRelocationTest extends AbstractTest {
         builder.expect(':app:compressDebugAssets', FROM_CACHE)
         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 android41xOnlyExpectations(ExpectedOutcomeBuilder builder) {
+        builder.expect(':app:mergeReleaseNativeDebugMetadata', NO_SOURCE)
+    }
+
     static void android40xOnlyExpectations(ExpectedOutcomeBuilder builder) {
         builder.expect(':app:dataBindingExportBuildInfoDebug', FROM_CACHE)
         builder.expect(':app:dataBindingExportBuildInfoRelease', FROM_CACHE)
@@ -491,6 +499,10 @@ class CrossVersionOutcomeAndRelocationTest extends AbstractTest {
         builder.expect(':library:bundleLibRuntimeToDirDebug', FROM_CACHE)
         builder.expect(':library:bundleLibRuntimeToDirRelease', FROM_CACHE)
         builder.expect(':app:optimizeReleaseResources', FROM_CACHE)
+        builder.expect(':app:mergeReleaseNativeDebugMetadata', FROM_CACHE)
+        builder.expect(':app:writeDebugAppMetadata', FROM_CACHE)
+        builder.expect(':app:extractReleaseNativeSymbolTables', FROM_CACHE)
+        builder.expect(':app:writeReleaseAppMetadata', 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,8 +12,8 @@ class WorkaroundTest extends Specification {
         workarounds.collect { it.class.simpleName.replaceAll(/Workaround/, "") }.sort() == expectedWorkarounds.sort()
         where:
         androidVersion  | expectedWorkarounds
-        "4.2.0-alpha10" | ['RoomSchemaLocation', 'CompileLibraryResources_4_2', 'MergeResources', 'DexFileDependencies']
-        "4.1.0-rc02"  | ['RoomSchemaLocation', 'CompileLibraryResources_4_0', 'MergeResources', 'DexFileDependencies']
+        "4.2.0-alpha12" | ['RoomSchemaLocation', 'CompileLibraryResources_4_2', 'MergeResources', 'DexFileDependencies']
+        "4.1.0-rc03"  | ['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']