Add support for 4.2.0-beta04

gradle · Feb 1, 2021 · 8df6669 · 8df6669
1 parent 9f50e32
commit 8df6669
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/build.gradle b/build.gradle
@@ -13,7 +13,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.2.0-beta03": ["6.8.1", "7.0-20210119173355+0000"],
+    "4.2.0-beta04": ["6.8.1", "7.0-20210119173355+0000"],
     "4.1.1": ["6.5.1", "6.8.1"],
     "4.0.2": ["6.1.1", "6.8.1"],
     "3.6.4": ["5.6.4", "6.8.1"],

diff --git a/src/test/groovy/org/gradle/android/CrossVersionOutcomeAndRelocationTest.groovy b/src/test/groovy/org/gradle/android/CrossVersionOutcomeAndRelocationTest.groovy
@@ -498,7 +498,7 @@ 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:mergeReleaseNativeDebugMetadata', NO_SOURCE)
         builder.expect(':app:writeDebugAppMetadata', FROM_CACHE)
         builder.expect(':app:extractReleaseNativeSymbolTables', FROM_CACHE)
         builder.expect(':app:writeReleaseAppMetadata', FROM_CACHE)

diff --git a/src/test/groovy/org/gradle/android/WorkaroundTest.groovy b/src/test/groovy/org/gradle/android/WorkaroundTest.groovy
@@ -13,7 +13,7 @@ class WorkaroundTest extends Specification {
         workarounds.collect { it.class.simpleName.replaceAll(/Workaround/, "") }.sort() == expectedWorkarounds.sort()
         where:
         androidVersion  | expectedWorkarounds
-        "4.2.0-beta03" | ['RoomSchemaLocation', 'CompileLibraryResources_4_2', 'MergeResources', 'DexFileDependencies']
+        "4.2.0-beta04" | ['RoomSchemaLocation', 'CompileLibraryResources_4_2', 'MergeResources', 'DexFileDependencies']
         "4.1.2"  | ['RoomSchemaLocation', 'CompileLibraryResources_4_0', 'MergeResources', 'DexFileDependencies']
         "4.0.2"         | ['MergeJavaResources', 'MergeNativeLibs', 'RoomSchemaLocation', 'CompileLibraryResources_4_0', 'MergeResources', 'DexFileDependencies']
         "3.6.4"         | ['MergeJavaResources', 'MergeNativeLibs', 'RoomSchemaLocation', 'DexFileDependencies']