From afa7dceb2fd0a789a17d5d14aa6543d9a7d4bd38 Mon Sep 17 00:00:00 2001
From: Nelson Osacky <nosacky@gradle.com>
Date: Thu, 28 Sep 2023 15:38:55 -0400
Subject: [PATCH] Update tests to execute against AGP 8.1.2 and AGP
 8.2.0-beta06

---
 build.gradle.kts                                              | 2 +-
 src/main/resources/versions.json                              | 4 ++--
 src/test/groovy/org/gradle/android/WorkaroundTest.groovy      | 4 ++--
 .../{8.1.1_outcomes.json => 8.1.2_outcomes.json}              | 0
 ...{8.2.0-beta05_outcomes.json => 8.2.0-beta06_outcomes.json} | 0
 5 files changed, 5 insertions(+), 5 deletions(-)
 rename src/test/resources/expectedOutcomes/{8.1.1_outcomes.json => 8.1.2_outcomes.json} (100%)
 rename src/test/resources/expectedOutcomes/{8.2.0-beta05_outcomes.json => 8.2.0-beta06_outcomes.json} (100%)

diff --git a/build.gradle.kts b/build.gradle.kts
index 6bf1ea7f..a4947283 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -29,7 +29,7 @@ repositories {
 
 dependencies {
     val versions = mapOf(
-        "agp" to "8.1.1",
+        "agp" to "8.1.2",
         "sdkBuildTools" to "31.1.1",
         "spock" to "2.3-groovy-3.0",
     )
diff --git a/src/main/resources/versions.json b/src/main/resources/versions.json
index a67f6f7a..e7890e8e 100644
--- a/src/main/resources/versions.json
+++ b/src/main/resources/versions.json
@@ -3,10 +3,10 @@
         "8.3.0-alpha05": [
             "8.3"
         ],
-        "8.2.0-beta05": [
+        "8.2.0-beta06": [
             "8.2.1"
         ],
-        "8.1.1": [
+        "8.1.2": [
             "8.0.2"
         ],
         "8.0.2": [
diff --git a/src/test/groovy/org/gradle/android/WorkaroundTest.groovy b/src/test/groovy/org/gradle/android/WorkaroundTest.groovy
index c9546d97..ca312f24 100644
--- a/src/test/groovy/org/gradle/android/WorkaroundTest.groovy
+++ b/src/test/groovy/org/gradle/android/WorkaroundTest.groovy
@@ -13,8 +13,8 @@ class WorkaroundTest extends Specification {
         where:
         androidVersion  | expectedWorkarounds
         "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.2.0-beta06"  | ['MergeSourceSetFolders', 'RoomSchemaLocation', 'ZipMergingTask', 'JdkImage', 'PackageForUnitTest']
+        "8.1.2"         | ['MergeSourceSetFolders', 'RoomSchemaLocation', 'ZipMergingTask', 'JdkImage', 'PackageForUnitTest']
         "8.0.2"         | ['MergeSourceSetFolders', 'RoomSchemaLocation', 'ZipMergingTask', 'JdkImage', 'PackageForUnitTest']
         "7.4.2"         | ['MergeSourceSetFolders', 'RoomSchemaLocation', 'ZipMergingTask', 'JdkImage', 'PackageForUnitTest']
         "7.3.1"         | ['MergeSourceSetFolders', 'RoomSchemaLocation', 'ZipMergingTask', 'JdkImage', 'PackageForUnitTest']
diff --git a/src/test/resources/expectedOutcomes/8.1.1_outcomes.json b/src/test/resources/expectedOutcomes/8.1.2_outcomes.json
similarity index 100%
rename from src/test/resources/expectedOutcomes/8.1.1_outcomes.json
rename to src/test/resources/expectedOutcomes/8.1.2_outcomes.json
diff --git a/src/test/resources/expectedOutcomes/8.2.0-beta05_outcomes.json b/src/test/resources/expectedOutcomes/8.2.0-beta06_outcomes.json
similarity index 100%
rename from src/test/resources/expectedOutcomes/8.2.0-beta05_outcomes.json
rename to src/test/resources/expectedOutcomes/8.2.0-beta06_outcomes.json