Skip to content

Commit d4c0c1e

Browse files
authored
Merge pull request #415 from gradle/agp_7_4
Update AGP 7.4
2 parents f120fa4 + 10bc50e commit d4c0c1e

File tree

5 files changed

+6
-3
lines changed

5 files changed

+6
-3
lines changed

README.md

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

2020
* Supported Gradle versions: 7.0+
21-
* Supported Android Gradle Plugin versions: 7.0.4, 7.1.3, 7.2.2, 7.3.1, 7.4.0-rc03, 8.0.0-alpha11
21+
* Supported Android Gradle Plugin versions: 7.0.4, 7.1.3, 7.2.2, 7.3.1, 7.4.0, 8.0.0-alpha11
2222
* Supported Kotlin versions: 1.6.0+
2323

2424
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: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
11
- [FIX] - Separating the processor dependency from the runtime dependency in Gradle Runner builds
2+
- [FIX] - #414 Apply configuration new variants API only when Plugins are present
3+
- [NEW] - Support AGP `7.4.0`
4+

src/main/resources/versions.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"8.0.0-alpha11": [
44
"7.6"
55
],
6-
"7.4.0-rc03": [
6+
"7.4.0": [
77
"7.6"
88
],
99
"7.3.1": [

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class WorkaroundTest extends Specification {
1313
where:
1414
androidVersion | expectedWorkarounds
1515
"8.0.0-alpha11" | ['MergeSourceSetFolders', 'RoomSchemaLocation', 'ZipMergingTask']
16-
"7.4.0-rc03" | ['MergeSourceSetFolders', 'RoomSchemaLocation', 'ZipMergingTask']
16+
"7.4.0" | ['MergeSourceSetFolders', 'RoomSchemaLocation', 'ZipMergingTask']
1717
"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']

src/test/resources/expectedOutcomes/7.4.0-rc03_outcomes.json renamed to src/test/resources/expectedOutcomes/7.4.0_outcomes.json

File renamed without changes.

0 commit comments

Comments
 (0)