Skip to content

Commit 76cb07b

Browse files
alextualextu
committed
Update to support AGP 7.3.0-beta03/7.4.0-alpha04
1 parent 2e60593 commit 76cb07b

File tree

5 files changed

+208
-4
lines changed

5 files changed

+208
-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.1, 7.3.0-alpha09
20+
* Supported Android Gradle Plugin versions: 7.0.4, 7.1.3, 7.2.1, 7.3.0-beta03, 7.4.0-alpha04
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: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
{
22
"supportedVersions": {
3-
"7.3.0-alpha09": [
3+
"7.4.0-alpha04": [
4+
"7.4.2"
5+
],
6+
"7.3.0-beta03": [
47
"7.4.2"
58
],
69
"7.2.1": [

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@ class WorkaroundTest extends Specification {
1212
workarounds.collect { it.class.simpleName.replaceAll(/Workaround/, "") }.sort() == expectedWorkarounds.sort()
1313
where:
1414
androidVersion | expectedWorkarounds
15-
"7.3.0-alpha09" | ['MergeSourceSetFolders', 'RoomSchemaLocation', 'ZipMergingTask', 'JdkImage']
16-
"7.2.1" | ['MergeSourceSetFolders', 'RoomSchemaLocation', 'ZipMergingTask', 'JdkImage']
15+
"7.4.0-alpha04" | ['MergeSourceSetFolders', 'RoomSchemaLocation', 'ZipMergingTask', 'JdkImage']
16+
"7.3.0-beta03" | ['MergeSourceSetFolders', 'RoomSchemaLocation', 'ZipMergingTask', 'JdkImage']
17+
"7.2.1" | ['MergeSourceSetFolders', 'RoomSchemaLocation', 'ZipMergingTask', 'JdkImage']
1718
"7.1.3" | ['BundleLibraryClasses', 'CompileLibraryResources', 'DataBindingMergeDependencyArtifacts', 'LibraryJniLibs', 'MergeNativeLibs', 'MergeSourceSetFolders', 'RoomSchemaLocation', 'StripDebugSymbols', 'ZipMergingTask', 'JdkImage']
1819
"7.0.4" | ['BundleLibraryClasses', 'CompileLibraryResources', 'DataBindingMergeDependencyArtifacts', 'LibraryJniLibs', 'MergeNativeLibs', 'MergeSourceSetFolders', 'RoomSchemaLocation', 'StripDebugSymbols', 'ZipMergingTask']
1920
}

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

File renamed without changes.

‎src/test/resources/expectedOutcomes/7.4.0-alpha04_outcomes.json‎

Lines changed: 200 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,200 @@
1+
{
2+
":app:assemble" : "SUCCESS",
3+
":app:assembleDebug" : "SUCCESS",
4+
":app:assembleRelease" : "SUCCESS",
5+
":app:checkDebugAarMetadata" : "SUCCESS",
6+
":app:checkDebugDuplicateClasses" : "SUCCESS",
7+
":app:checkReleaseAarMetadata" : "SUCCESS",
8+
":app:checkReleaseDuplicateClasses" : "SUCCESS",
9+
":app:collectReleaseDependencies" : "SUCCESS",
10+
":app:compileDebugAidl" : "NO_SOURCE",
11+
":app:compileDebugJavaWithJavac" : "FROM_CACHE",
12+
":app:compileDebugKotlin" : "FROM_CACHE",
13+
":app:compileDebugRenderscript" : "FROM_CACHE",
14+
":app:compileDebugShaders" : "NO_SOURCE",
15+
":app:compileReleaseAidl" : "NO_SOURCE",
16+
":app:compileReleaseArtProfile" : "FROM_CACHE",
17+
":app:compileReleaseJavaWithJavac" : "FROM_CACHE",
18+
":app:compileReleaseKotlin" : "FROM_CACHE",
19+
":app:compileReleaseRenderscript" : "FROM_CACHE",
20+
":app:compileReleaseShaders" : "NO_SOURCE",
21+
":app:compressDebugAssets" : "FROM_CACHE",
22+
":app:compressReleaseAssets" : "FROM_CACHE",
23+
":app:createDebugApkListingFileRedirect" : "SUCCESS",
24+
":app:createDebugCompatibleScreenManifests" : "SUCCESS",
25+
":app:createReleaseApkListingFileRedirect" : "SUCCESS",
26+
":app:createReleaseCompatibleScreenManifests" : "SUCCESS",
27+
":app:dataBindingGenBaseClassesDebug" : "FROM_CACHE",
28+
":app:dataBindingGenBaseClassesRelease" : "FROM_CACHE",
29+
":app:dataBindingMergeDependencyArtifactsDebug" : "SUCCESS",
30+
":app:dataBindingMergeDependencyArtifactsRelease" : "SUCCESS",
31+
":app:dataBindingTriggerDebug" : "SUCCESS",
32+
":app:dataBindingTriggerRelease" : "SUCCESS",
33+
":app:desugarDebugFileDependencies" : "FROM_CACHE",
34+
":app:desugarReleaseFileDependencies" : "FROM_CACHE",
35+
":app:dexBuilderDebug" : "FROM_CACHE",
36+
":app:dexBuilderRelease" : "FROM_CACHE",
37+
":app:extractDeepLinksDebug" : "FROM_CACHE",
38+
":app:extractDeepLinksRelease" : "FROM_CACHE",
39+
":app:extractReleaseNativeSymbolTables" : "NO_SOURCE",
40+
":app:generateDebugAssets" : "UP_TO_DATE",
41+
":app:generateDebugBuildConfig" : "FROM_CACHE",
42+
":app:generateDebugResources" : "UP_TO_DATE",
43+
":app:generateDebugResValues" : "FROM_CACHE",
44+
":app:generateReleaseAssets" : "UP_TO_DATE",
45+
":app:generateReleaseBuildConfig" : "FROM_CACHE",
46+
":app:generateReleaseResources" : "UP_TO_DATE",
47+
":app:generateReleaseResValues" : "FROM_CACHE",
48+
":app:javaPreCompileDebug" : "FROM_CACHE",
49+
":app:javaPreCompileRelease" : "FROM_CACHE",
50+
":app:kaptDebugKotlin" : "FROM_CACHE",
51+
":app:kaptGenerateStubsDebugKotlin" : "FROM_CACHE",
52+
":app:kaptGenerateStubsReleaseKotlin" : "FROM_CACHE",
53+
":app:kaptReleaseKotlin" : "FROM_CACHE",
54+
":app:mapDebugSourceSetPaths" : "SUCCESS",
55+
":app:mapReleaseSourceSetPaths" : "SUCCESS",
56+
":app:mergeDebugAssets" : "SUCCESS",
57+
":app:mergeDebugJavaResource" : "SUCCESS",
58+
":app:mergeDebugJniLibFolders" : "SUCCESS",
59+
":app:mergeDebugNativeDebugMetadata" : "NO_SOURCE",
60+
":app:mergeDebugNativeLibs" : "NO_SOURCE",
61+
":app:mergeDebugResources" : "FROM_CACHE",
62+
":app:mergeDebugShaders" : "SUCCESS",
63+
":app:mergeDexRelease" : "FROM_CACHE",
64+
":app:mergeExtDexDebug" : "FROM_CACHE",
65+
":app:mergeExtDexRelease" : "FROM_CACHE",
66+
":app:mergeLibDexDebug" : "FROM_CACHE",
67+
":app:mergeProjectDexDebug" : "FROM_CACHE",
68+
":app:mergeReleaseArtProfile" : "SUCCESS",
69+
":app:mergeReleaseAssets" : "SUCCESS",
70+
":app:mergeReleaseJavaResource" : "SUCCESS",
71+
":app:mergeReleaseJniLibFolders" : "SUCCESS",
72+
":app:mergeReleaseNativeDebugMetadata" : "NO_SOURCE",
73+
":app:mergeReleaseNativeLibs" : "NO_SOURCE",
74+
":app:mergeReleaseResources" : "FROM_CACHE",
75+
":app:mergeReleaseShaders" : "SUCCESS",
76+
":app:mergeRoomSchemaLocations" : "SUCCESS",
77+
":app:optimizeReleaseResources" : "FROM_CACHE",
78+
":app:packageDebug" : "SUCCESS",
79+
":app:packageRelease" : "SUCCESS",
80+
":app:preBuild" : "UP_TO_DATE",
81+
":app:preDebugBuild" : "UP_TO_DATE",
82+
":app:preReleaseBuild" : "UP_TO_DATE",
83+
":app:processDebugJavaRes" : "NO_SOURCE",
84+
":app:processDebugMainManifest" : "FROM_CACHE",
85+
":app:processDebugManifest" : "FROM_CACHE",
86+
":app:processDebugManifestForPackage" : "FROM_CACHE",
87+
":app:processDebugResources" : "FROM_CACHE",
88+
":app:processReleaseJavaRes" : "NO_SOURCE",
89+
":app:processReleaseMainManifest" : "FROM_CACHE",
90+
":app:processReleaseManifest" : "FROM_CACHE",
91+
":app:processReleaseManifestForPackage" : "FROM_CACHE",
92+
":app:processReleaseResources" : "FROM_CACHE",
93+
":app:sdkReleaseDependencyData" : "SUCCESS",
94+
":app:stripDebugDebugSymbols" : "NO_SOURCE",
95+
":app:stripReleaseDebugSymbols" : "NO_SOURCE",
96+
":app:validateSigningDebug" : "SUCCESS",
97+
":app:writeDebugAppMetadata" : "SUCCESS",
98+
":app:writeDebugSigningConfigVersions" : "SUCCESS",
99+
":app:writeReleaseAppMetadata" : "SUCCESS",
100+
":app:writeReleaseSigningConfigVersions" : "SUCCESS",
101+
":library:assemble" : "SUCCESS",
102+
":library:assembleDebug" : "SUCCESS",
103+
":library:assembleRelease" : "SUCCESS",
104+
":library:bundleDebugAar" : "SUCCESS",
105+
":library:bundleLibCompileToJarDebug" : "SUCCESS",
106+
":library:bundleLibCompileToJarRelease" : "SUCCESS",
107+
":library:bundleLibResDebug" : "SUCCESS",
108+
":library:bundleLibResRelease" : "SUCCESS",
109+
":library:bundleLibRuntimeToDirDebug" : "SUCCESS",
110+
":library:bundleLibRuntimeToDirRelease" : "SUCCESS",
111+
":library:bundleLibRuntimeToJarDebug" : "SUCCESS",
112+
":library:bundleLibRuntimeToJarRelease" : "SUCCESS",
113+
":library:bundleReleaseAar" : "SUCCESS",
114+
":library:compileDebugAidl" : "NO_SOURCE",
115+
":library:compileDebugJavaWithJavac" : "FROM_CACHE",
116+
":library:compileDebugKotlin" : "FROM_CACHE",
117+
":library:compileDebugLibraryResources" : "FROM_CACHE",
118+
":library:compileDebugRenderscript" : "FROM_CACHE",
119+
":library:compileDebugShaders" : "NO_SOURCE",
120+
":library:compileReleaseAidl" : "NO_SOURCE",
121+
":library:compileReleaseJavaWithJavac" : "FROM_CACHE",
122+
":library:compileReleaseKotlin" : "FROM_CACHE",
123+
":library:compileReleaseLibraryResources" : "FROM_CACHE",
124+
":library:compileReleaseRenderscript" : "FROM_CACHE",
125+
":library:compileReleaseShaders" : "NO_SOURCE",
126+
":library:copyDebugJniLibsProjectAndLocalJars" : "SUCCESS",
127+
":library:copyDebugJniLibsProjectOnly" : "SUCCESS",
128+
":library:copyReleaseJniLibsProjectAndLocalJars" : "SUCCESS",
129+
":library:copyReleaseJniLibsProjectOnly" : "SUCCESS",
130+
":library:createFullJarDebug" : "SUCCESS",
131+
":library:createFullJarRelease" : "SUCCESS",
132+
":library:dataBindingGenBaseClassesDebug" : "FROM_CACHE",
133+
":library:dataBindingGenBaseClassesRelease" : "FROM_CACHE",
134+
":library:dataBindingMergeDependencyArtifactsDebug" : "SUCCESS",
135+
":library:dataBindingMergeDependencyArtifactsRelease": "SUCCESS",
136+
":library:dataBindingTriggerDebug" : "SUCCESS",
137+
":library:dataBindingTriggerRelease" : "SUCCESS",
138+
":library:extractDebugAnnotations" : "FROM_CACHE",
139+
":library:extractDeepLinksDebug" : "FROM_CACHE",
140+
":library:extractDeepLinksForAarDebug" : "FROM_CACHE",
141+
":library:extractDeepLinksForAarRelease" : "FROM_CACHE",
142+
":library:extractDeepLinksRelease" : "FROM_CACHE",
143+
":library:extractReleaseAnnotations" : "FROM_CACHE",
144+
":library:generateDebugAssets" : "UP_TO_DATE",
145+
":library:generateDebugBuildConfig" : "FROM_CACHE",
146+
":library:generateDebugResources" : "UP_TO_DATE",
147+
":library:generateDebugResValues" : "FROM_CACHE",
148+
":library:generateDebugRFile" : "FROM_CACHE",
149+
":library:generateReleaseAssets" : "UP_TO_DATE",
150+
":library:generateReleaseBuildConfig" : "FROM_CACHE",
151+
":library:generateReleaseResources" : "UP_TO_DATE",
152+
":library:generateReleaseResValues" : "FROM_CACHE",
153+
":library:generateReleaseRFile" : "FROM_CACHE",
154+
":library:javaPreCompileDebug" : "FROM_CACHE",
155+
":library:javaPreCompileRelease" : "FROM_CACHE",
156+
":library:kaptDebugKotlin" : "FROM_CACHE",
157+
":library:kaptGenerateStubsDebugKotlin" : "FROM_CACHE",
158+
":library:kaptGenerateStubsReleaseKotlin" : "FROM_CACHE",
159+
":library:kaptReleaseKotlin" : "FROM_CACHE",
160+
":library:mapReleaseSourceSetPaths" : "SUCCESS",
161+
":library:mergeDebugConsumerProguardFiles" : "SUCCESS",
162+
":library:mergeDebugGeneratedProguardFiles" : "SUCCESS",
163+
":library:mergeDebugJavaResource" : "SUCCESS",
164+
":library:mergeDebugJniLibFolders" : "SUCCESS",
165+
":library:mergeDebugNativeLibs" : "NO_SOURCE",
166+
":library:mergeDebugShaders" : "SUCCESS",
167+
":library:mergeReleaseConsumerProguardFiles" : "SUCCESS",
168+
":library:mergeReleaseGeneratedProguardFiles" : "SUCCESS",
169+
":library:mergeReleaseJavaResource" : "SUCCESS",
170+
":library:mergeReleaseJniLibFolders" : "SUCCESS",
171+
":library:mergeReleaseNativeLibs" : "NO_SOURCE",
172+
":library:mergeReleaseResources" : "FROM_CACHE",
173+
":library:mergeReleaseShaders" : "SUCCESS",
174+
":library:mergeRoomSchemaLocations" : "SUCCESS",
175+
":library:packageDebugAssets" : "SUCCESS",
176+
":library:packageDebugRenderscript" : "NO_SOURCE",
177+
":library:packageDebugResources" : "FROM_CACHE",
178+
":library:packageReleaseAssets" : "SUCCESS",
179+
":library:packageReleaseRenderscript" : "NO_SOURCE",
180+
":library:packageReleaseResources" : "FROM_CACHE",
181+
":library:parseDebugLocalResources" : "FROM_CACHE",
182+
":library:parseReleaseLocalResources" : "FROM_CACHE",
183+
":library:preBuild" : "UP_TO_DATE",
184+
":library:preDebugBuild" : "UP_TO_DATE",
185+
":library:prepareDebugArtProfile" : "SUCCESS",
186+
":library:prepareLintJarForPublish" : "SUCCESS",
187+
":library:prepareReleaseArtProfile" : "SUCCESS",
188+
":library:preReleaseBuild" : "UP_TO_DATE",
189+
":library:processDebugJavaRes" : "NO_SOURCE",
190+
":library:processDebugManifest" : "FROM_CACHE",
191+
":library:processReleaseJavaRes" : "NO_SOURCE",
192+
":library:processReleaseManifest" : "FROM_CACHE",
193+
":library:stripDebugDebugSymbols" : "NO_SOURCE",
194+
":library:stripReleaseDebugSymbols" : "NO_SOURCE",
195+
":library:syncDebugLibJars" : "FROM_CACHE",
196+
":library:syncReleaseLibJars" : "FROM_CACHE",
197+
":library:verifyReleaseResources" : "UNKNOWN",
198+
":library:writeDebugAarMetadata" : "SUCCESS",
199+
":library:writeReleaseAarMetadata" : "SUCCESS"
200+
}

0 commit comments

Comments
 (0)