Merge pull request #588 from gradle/no/update-versions

Update tests to execute against AGP 8.1.2 and AGP 8.2.0-beta06
gradle · Sep 28, 2023 · ecb3dc8 · ecb3dc8
2 parents 5091ad6 + afa7dce
commit ecb3dc8
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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/...rces/expectedOutcomes/8.1.1_outcomes.json → ...rces/expectedOutcomes/8.1.2_outcomes.json b/...rces/expectedOutcomes/8.1.1_outcomes.json → ...rces/expectedOutcomes/8.1.2_outcomes.json
diff --git a/...pectedOutcomes/8.2.0-beta05_outcomes.json → ...pectedOutcomes/8.2.0-beta06_outcomes.json b/...pectedOutcomes/8.2.0-beta05_outcomes.json → ...pectedOutcomes/8.2.0-beta06_outcomes.json