From f091df168a011d8f6d36bfab6e8dbb6fc3a00300 Mon Sep 17 00:00:00 2001 From: Inaki Villar Date: Mon, 25 Sep 2023 07:07:54 -0700 Subject: [PATCH 1/2] update agp 8.2.0-beta05 --- src/main/resources/versions.json | 2 +- src/test/groovy/org/gradle/android/WorkaroundTest.groovy | 2 +- .../{8.2.0-beta02_outcomes.json => 8.2.0-beta05_outcomes.json} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename src/test/resources/expectedOutcomes/{8.2.0-beta02_outcomes.json => 8.2.0-beta05_outcomes.json} (100%) diff --git a/src/main/resources/versions.json b/src/main/resources/versions.json index 85ccee49..3c0260b9 100644 --- a/src/main/resources/versions.json +++ b/src/main/resources/versions.json @@ -3,7 +3,7 @@ "8.3.0-alpha03": [ "8.3" ], - "8.2.0-beta02": [ + "8.2.0-beta05": [ "8.2.1" ], "8.1.1": [ diff --git a/src/test/groovy/org/gradle/android/WorkaroundTest.groovy b/src/test/groovy/org/gradle/android/WorkaroundTest.groovy index 00c823b6..2fd55490 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.3.0-alpha03" | ['MergeSourceSetFolders', 'RoomSchemaLocation', 'ZipMergingTask', 'JdkImage'] - "8.2.0-beta02" | ['MergeSourceSetFolders', 'RoomSchemaLocation', 'ZipMergingTask', 'JdkImage', 'PackageForUnitTest'] + "8.2.0-beta05" | ['MergeSourceSetFolders', 'RoomSchemaLocation', 'ZipMergingTask', 'JdkImage', 'PackageForUnitTest'] "8.1.1" | ['MergeSourceSetFolders', 'RoomSchemaLocation', 'ZipMergingTask', 'JdkImage', 'PackageForUnitTest'] "8.0.2" | ['MergeSourceSetFolders', 'RoomSchemaLocation', 'ZipMergingTask', 'JdkImage', 'PackageForUnitTest'] "7.4.2" | ['MergeSourceSetFolders', 'RoomSchemaLocation', 'ZipMergingTask', 'JdkImage', 'PackageForUnitTest'] diff --git a/src/test/resources/expectedOutcomes/8.2.0-beta02_outcomes.json b/src/test/resources/expectedOutcomes/8.2.0-beta05_outcomes.json similarity index 100% rename from src/test/resources/expectedOutcomes/8.2.0-beta02_outcomes.json rename to src/test/resources/expectedOutcomes/8.2.0-beta05_outcomes.json From 3d4f9f87f8f2fd617e5b93503b6afed21739d358 Mon Sep 17 00:00:00 2001 From: Inaki Villar Date: Mon, 25 Sep 2023 09:21:30 -0700 Subject: [PATCH 2/2] update to agp 8.3.0-alpha05 --- src/main/resources/versions.json | 2 +- src/test/groovy/org/gradle/android/WorkaroundTest.groovy | 2 +- ...{8.3.0-alpha03_outcomes.json => 8.3.0-alpha05_outcomes.json} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename src/test/resources/expectedOutcomes/{8.3.0-alpha03_outcomes.json => 8.3.0-alpha05_outcomes.json} (100%) diff --git a/src/main/resources/versions.json b/src/main/resources/versions.json index 3c0260b9..a67f6f7a 100644 --- a/src/main/resources/versions.json +++ b/src/main/resources/versions.json @@ -1,6 +1,6 @@ { "supportedVersions": { - "8.3.0-alpha03": [ + "8.3.0-alpha05": [ "8.3" ], "8.2.0-beta05": [ diff --git a/src/test/groovy/org/gradle/android/WorkaroundTest.groovy b/src/test/groovy/org/gradle/android/WorkaroundTest.groovy index 2fd55490..c9546d97 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.3.0-alpha03" | ['MergeSourceSetFolders', 'RoomSchemaLocation', 'ZipMergingTask', 'JdkImage'] + "8.3.0-alpha05" | ['MergeSourceSetFolders', 'RoomSchemaLocation', 'ZipMergingTask', 'JdkImage'] "8.2.0-beta05" | ['MergeSourceSetFolders', 'RoomSchemaLocation', 'ZipMergingTask', 'JdkImage', 'PackageForUnitTest'] "8.1.1" | ['MergeSourceSetFolders', 'RoomSchemaLocation', 'ZipMergingTask', 'JdkImage', 'PackageForUnitTest'] "8.0.2" | ['MergeSourceSetFolders', 'RoomSchemaLocation', 'ZipMergingTask', 'JdkImage', 'PackageForUnitTest'] diff --git a/src/test/resources/expectedOutcomes/8.3.0-alpha03_outcomes.json b/src/test/resources/expectedOutcomes/8.3.0-alpha05_outcomes.json similarity index 100% rename from src/test/resources/expectedOutcomes/8.3.0-alpha03_outcomes.json rename to src/test/resources/expectedOutcomes/8.3.0-alpha05_outcomes.json