Skip to content

Commit 4c4c2ae

Browse files
authored
Merge pull request #357 from gradle/jprinet/update_agp_7.3.1
Add AGP 7.3.1 support
2 parents 08db0e5 + 1d9d3fd commit 4c4c2ae

File tree

5 files changed

+5
-4
lines changed

5 files changed

+5
-4
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
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)
1818

1919
* Supported Gradle versions: 7.0+
20-
* Supported Android Gradle Plugin versions: 7.0.4, 7.1.3, 7.2.2, 7.3.0, 7.4.0-beta02, 8.0.0-alpha03
20+
* Supported Android Gradle Plugin versions: 7.0.4, 7.1.3, 7.2.2, 7.3.1, 7.4.0-beta02, 8.0.0-alpha03
2121
* Supported Kotlin versions: 1.4.32+
2222

2323
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.

release/changes.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
- [NEW] - Support AGP `7.4.0-beta02` and `8.0.0-alpha03`
1+
- [NEW] - Support AGP `7.4.0-beta02` and `8.0.0-alpha03`
2+
- [NEW] - Support AGP `7.3.1`

src/main/resources/versions.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"7.4.0-beta02": [
77
"7.5.1"
88
],
9-
"7.3.0": [
9+
"7.3.1": [
1010
"7.4.2",
1111
"7.5.1"
1212
],

src/test/groovy/org/gradle/android/WorkaroundTest.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class WorkaroundTest extends Specification {
1414
androidVersion | expectedWorkarounds
1515
"8.0.0-alpha03" | ['MergeSourceSetFolders', 'RoomSchemaLocation', 'ZipMergingTask']
1616
"7.4.0-beta02" | ['MergeSourceSetFolders', 'RoomSchemaLocation', 'ZipMergingTask']
17-
"7.3.0" | ['MergeSourceSetFolders', 'RoomSchemaLocation', 'ZipMergingTask', 'JdkImage']
17+
"7.3.1" | ['MergeSourceSetFolders', 'RoomSchemaLocation', 'ZipMergingTask', 'JdkImage']
1818
"7.2.2" | ['MergeSourceSetFolders', 'RoomSchemaLocation', 'ZipMergingTask', 'JdkImage']
1919
"7.1.3" | ['BundleLibraryClasses', 'CompileLibraryResources', 'DataBindingMergeDependencyArtifacts', 'LibraryJniLibs', 'MergeNativeLibs', 'MergeSourceSetFolders', 'RoomSchemaLocation', 'StripDebugSymbols', 'ZipMergingTask', 'JdkImage']
2020
"7.0.4" | ['BundleLibraryClasses', 'CompileLibraryResources', 'DataBindingMergeDependencyArtifacts', 'LibraryJniLibs', 'MergeNativeLibs', 'MergeSourceSetFolders', 'RoomSchemaLocation', 'StripDebugSymbols', 'ZipMergingTask']

0 commit comments

Comments
 (0)