Skip to content

Commit 2847b24

Browse files
committed
Update to support AGP 7.2.0-rc01/7.3.0-alpha09
1 parent 3498c50 commit 2847b24

File tree

5 files changed

+7
-5
lines changed

5 files changed

+7
-5
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.0-beta04, 7.3.0-alpha08
20+
* Supported Android Gradle Plugin versions: 7.0.4, 7.1.3, 7.2.0-rc01, 7.3.0-alpha09
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.

src/main/resources/versions.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"supportedVersions": {
3-
"7.3.0-alpha08": [
3+
"7.3.0-alpha09": [
44
"7.4.2"
55
],
6-
"7.2.0-beta04": [
6+
"7.2.0-rc01": [
77
"7.3.3",
88
"7.4.2"
99
],

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ class WorkaroundTest extends Specification {
1212
workarounds.collect { it.class.simpleName.replaceAll(/Workaround/, "") }.sort() == expectedWorkarounds.sort()
1313
where:
1414
androidVersion | expectedWorkarounds
15-
"7.3.0-alpha08" | ['MergeSourceSetFolders', 'RoomSchemaLocation', 'ZipMergingTask']
16-
"7.2.0-beta04" | ['MergeSourceSetFolders', 'RoomSchemaLocation', 'ZipMergingTask']
15+
"7.3.0-alpha09" | ['MergeSourceSetFolders', 'RoomSchemaLocation', 'ZipMergingTask']
16+
"7.2.0-rc01" | ['MergeSourceSetFolders', 'RoomSchemaLocation', 'ZipMergingTask']
1717
"7.1.3" | ['BundleLibraryClasses', 'CompileLibraryResources', 'DataBindingMergeDependencyArtifacts', 'LibraryJniLibs', 'MergeNativeLibs', 'MergeSourceSetFolders', 'RoomSchemaLocation', 'StripDebugSymbols', 'ZipMergingTask']
1818
"7.0.4" | ['BundleLibraryClasses', 'CompileLibraryResources', 'DataBindingMergeDependencyArtifacts', 'LibraryJniLibs', 'MergeNativeLibs', 'MergeSourceSetFolders', 'RoomSchemaLocation', 'StripDebugSymbols', 'ZipMergingTask']
1919
}
File renamed without changes.

src/test/resources/expectedOutcomes/7.3.0-alpha08_outcomes.json renamed to src/test/resources/expectedOutcomes/7.3.0-alpha09_outcomes.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,8 @@
137137
":library:dataBindingTriggerRelease" : "SUCCESS",
138138
":library:extractDebugAnnotations" : "FROM_CACHE",
139139
":library:extractDeepLinksDebug" : "FROM_CACHE",
140+
":library:extractDeepLinksForAarDebug" : "FROM_CACHE",
141+
":library:extractDeepLinksForAarRelease" : "FROM_CACHE",
140142
":library:extractDeepLinksRelease" : "FROM_CACHE",
141143
":library:extractReleaseAnnotations" : "FROM_CACHE",
142144
":library:generateDebugAssets" : "UP_TO_DATE",

0 commit comments

Comments
 (0)