From 57a2bfdcce6e96a12eb74d4cbbd29bb38b7df4d7 Mon Sep 17 00:00:00 2001 From: Gasper Kojek Date: Tue, 6 Feb 2024 08:54:51 +0100 Subject: [PATCH 1/2] Updated AGP to 8.4.0-alpha08 --- src/main/resources/versions.json | 2 +- src/test/groovy/org/gradle/android/WorkaroundTest.groovy | 2 +- ...{8.4.0-alpha07_outcomes.json => 8.4.0-alpha08_outcomes.json} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename src/test/resources/expectedOutcomes/{8.4.0-alpha07_outcomes.json => 8.4.0-alpha08_outcomes.json} (100%) diff --git a/src/main/resources/versions.json b/src/main/resources/versions.json index 32ea285d..7895846b 100644 --- a/src/main/resources/versions.json +++ b/src/main/resources/versions.json @@ -1,6 +1,6 @@ { "supportedVersions": { - "8.4.0-alpha07": [ + "8.4.0-alpha08": [ "8.6" ], "8.3.0-beta02": [ diff --git a/src/test/groovy/org/gradle/android/WorkaroundTest.groovy b/src/test/groovy/org/gradle/android/WorkaroundTest.groovy index 0c452ad8..0a1add42 100644 --- a/src/test/groovy/org/gradle/android/WorkaroundTest.groovy +++ b/src/test/groovy/org/gradle/android/WorkaroundTest.groovy @@ -12,7 +12,7 @@ class WorkaroundTest extends Specification { workarounds.collect { it.class.simpleName.replaceAll(/Workaround/, "") }.sort() == expectedWorkarounds.sort() where: androidVersion | expectedWorkarounds - "8.4.0-alpha07" | ['JdkImage'] + "8.4.0-alpha08" | ['JdkImage'] "8.3.0-beta02" | ['MergeSourceSetFolders', 'JdkImage'] "8.2.2" | ['MergeSourceSetFolders', 'JdkImage', 'PackageForUnitTest'] "8.1.4" | ['MergeSourceSetFolders', 'JdkImage', 'PackageForUnitTest'] diff --git a/src/test/resources/expectedOutcomes/8.4.0-alpha07_outcomes.json b/src/test/resources/expectedOutcomes/8.4.0-alpha08_outcomes.json similarity index 100% rename from src/test/resources/expectedOutcomes/8.4.0-alpha07_outcomes.json rename to src/test/resources/expectedOutcomes/8.4.0-alpha08_outcomes.json From 1af554e17422dde5af4f388230cad348cac92ff1 Mon Sep 17 00:00:00 2001 From: Gasper Kojek Date: Tue, 6 Feb 2024 09:33:42 +0100 Subject: [PATCH 2/2] Style --- src/test/groovy/org/gradle/android/WorkaroundTest.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/groovy/org/gradle/android/WorkaroundTest.groovy b/src/test/groovy/org/gradle/android/WorkaroundTest.groovy index 2ddc07ba..3aec6937 100644 --- 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 { where: androidVersion | expectedWorkarounds "8.4.0-alpha08" | ['JdkImage'] - "8.3.0-rc01" | ['MergeSourceSetFolders', 'JdkImage'] + "8.3.0-rc01" | ['MergeSourceSetFolders', 'JdkImage'] "8.2.2" | ['MergeSourceSetFolders', 'JdkImage', 'PackageForUnitTest'] "8.1.4" | ['MergeSourceSetFolders', 'JdkImage', 'PackageForUnitTest'] "8.0.2" | ['MergeSourceSetFolders', 'ZipMergingTask', 'JdkImage', 'PackageForUnitTest']