Merge pull request #602 from gradle/iv/agp_updates

Updates 8.2.0-rc01 and 8.3.0-alpha09
gradle · Oct 20, 2023 · 5c1aa8f · 5c1aa8f
2 parents 52c4195 + 039a153
commit 5c1aa8f
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -17,7 +17,7 @@
 Some Android plugin versions have issues with Gradle's build cache feature. When applied to an Android project this plugin applies workarounds for these issues based on the Android plugin and Gradle versions. For other versions, please see [older versions.](#older-android-gradle-plugin-versions)
 
 * Supported Gradle versions: 7.0+
-* Supported Android Gradle Plugin versions: 7.0, 7.1, 7.2, 7.3, 7.4, 8.0, 8.1, 8.2.0-beta, and 8.3.0-alpha
+* Supported Android Gradle Plugin versions: 7.0, 7.1, 7.2, 7.3, 7.4, 8.0, 8.1, 8.2.0-rc, and 8.3.0-alpha
 * Supported Kotlin versions: 1.7.0+
 
 We only test against the latest patch versions of each minor version of Android Gradle Plugin.  This means that although it may work perfectly well with an older patch version (say 7.0.1), we do not test against these older patch versions, so the latest patch version is the only version from that minor release that we technically support.

diff --git a/src/main/resources/versions.json b/src/main/resources/versions.json
@@ -1,9 +1,9 @@
 {
     "supportedVersions": {
-        "8.3.0-alpha07": [
+        "8.3.0-alpha09": [
             "8.4"
         ],
-        "8.2.0-beta06": [
+        "8.2.0-rc01": [
             "8.4"
         ],
         "8.1.2": [

diff --git a/src/test/groovy/org/gradle/android/WorkaroundTest.groovy b/src/test/groovy/org/gradle/android/WorkaroundTest.groovy
@@ -12,8 +12,8 @@ class WorkaroundTest extends Specification {
         workarounds.collect { it.class.simpleName.replaceAll(/Workaround/, "") }.sort() == expectedWorkarounds.sort()
         where:
         androidVersion  | expectedWorkarounds
-        "8.3.0-alpha07" | ['MergeSourceSetFolders', 'ZipMergingTask', 'JdkImage']
-        "8.2.0-beta06"  | ['MergeSourceSetFolders', 'ZipMergingTask', 'JdkImage', 'PackageForUnitTest']
+        "8.3.0-alpha09" | ['MergeSourceSetFolders', 'ZipMergingTask', 'JdkImage']
+        "8.2.0-rc01"    | ['MergeSourceSetFolders', 'ZipMergingTask', 'JdkImage', 'PackageForUnitTest']
         "8.1.2"         | ['MergeSourceSetFolders', 'ZipMergingTask', 'JdkImage', 'PackageForUnitTest']
         "8.0.2"         | ['MergeSourceSetFolders', 'ZipMergingTask', 'JdkImage', 'PackageForUnitTest']
         "7.4.2"         | ['MergeSourceSetFolders', 'ZipMergingTask', 'JdkImage', 'PackageForUnitTest']

diff --git a/...pectedOutcomes/8.2.0-beta06_outcomes.json → ...expectedOutcomes/8.2.0-rc01_outcomes.json b/...pectedOutcomes/8.2.0-beta06_outcomes.json → ...expectedOutcomes/8.2.0-rc01_outcomes.json
diff --git a/...ectedOutcomes/8.3.0-alpha07_outcomes.json → ...ectedOutcomes/8.3.0-alpha09_outcomes.json b/...ectedOutcomes/8.3.0-alpha07_outcomes.json → ...ectedOutcomes/8.3.0-alpha09_outcomes.json