Skip to content

Commit

Permalink
Merge pull request #306 from gradle/atual/agp-update
Browse files Browse the repository at this point in the history 
Update to support AGP 7.3.0-beta03/7.4.0-alpha04
  • Loading branch information
@alextu
alextu authored Jun 15, 2022
2 parents 2e60593 + 4e5a650 commit 3cfde3e
Show file tree
Hide file tree
Showing 6 changed files with 210 additions and 4 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.4, 7.1.3, 7.2.1, 7.3.0-alpha09
* Supported Android Gradle Plugin versions: 7.0.4, 7.1.3, 7.2.1, 7.3.0-beta03, 7.4.0-alpha04
* Supported Kotlin versions: 1.4.32+

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.
Expand Down
2 changes: 2 additions & 0 deletions release/changes.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- [NEW] - Add workaround for jdkImage cache miss
- [NEW] - Support AGP `7.3.0-beta03` and `7.4.0-alpha04`
5 changes: 4 additions & 1 deletion src/main/resources/versions.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
{
"supportedVersions": {
"7.3.0-alpha09": [
"7.4.0-alpha04": [
"7.4.2"
],
"7.3.0-beta03": [
"7.4.2"
],
"7.2.1": [
Expand Down
5 changes: 3 additions & 2 deletions src/test/groovy/org/gradle/android/WorkaroundTest.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@ class WorkaroundTest extends Specification {
workarounds.collect { it.class.simpleName.replaceAll(/Workaround/, "") }.sort() == expectedWorkarounds.sort()
where:
androidVersion | expectedWorkarounds
"7.3.0-alpha09" | ['MergeSourceSetFolders', 'RoomSchemaLocation', 'ZipMergingTask', 'JdkImage']
"7.2.1" | ['MergeSourceSetFolders', 'RoomSchemaLocation', 'ZipMergingTask', 'JdkImage']
"7.4.0-alpha04" | ['MergeSourceSetFolders', 'RoomSchemaLocation', 'ZipMergingTask', 'JdkImage']
"7.3.0-beta03" | ['MergeSourceSetFolders', 'RoomSchemaLocation', 'ZipMergingTask', 'JdkImage']
"7.2.1" | ['MergeSourceSetFolders', 'RoomSchemaLocation', 'ZipMergingTask', 'JdkImage']
"7.1.3" | ['BundleLibraryClasses', 'CompileLibraryResources', 'DataBindingMergeDependencyArtifacts', 'LibraryJniLibs', 'MergeNativeLibs', 'MergeSourceSetFolders', 'RoomSchemaLocation', 'StripDebugSymbols', 'ZipMergingTask', 'JdkImage']
"7.0.4" | ['BundleLibraryClasses', 'CompileLibraryResources', 'DataBindingMergeDependencyArtifacts', 'LibraryJniLibs', 'MergeNativeLibs', 'MergeSourceSetFolders', 'RoomSchemaLocation', 'StripDebugSymbols', 'ZipMergingTask']
}
Expand Down
0 ...ectedOutcomes/7.3.0-alpha09_outcomes.json → ...pectedOutcomes/7.3.0-beta03_outcomes.json
View file
File renamed without changes.
200 changes: 200 additions & 0 deletions src/test/resources/expectedOutcomes/7.4.0-alpha04_outcomes.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,200 @@
{
":app:assemble" : "SUCCESS",
":app:assembleDebug" : "SUCCESS",
":app:assembleRelease" : "SUCCESS",
":app:checkDebugAarMetadata" : "SUCCESS",
":app:checkDebugDuplicateClasses" : "SUCCESS",
":app:checkReleaseAarMetadata" : "SUCCESS",
":app:checkReleaseDuplicateClasses" : "SUCCESS",
":app:collectReleaseDependencies" : "SUCCESS",
":app:compileDebugAidl" : "NO_SOURCE",
":app:compileDebugJavaWithJavac" : "FROM_CACHE",
":app:compileDebugKotlin" : "FROM_CACHE",
":app:compileDebugRenderscript" : "FROM_CACHE",
":app:compileDebugShaders" : "NO_SOURCE",
":app:compileReleaseAidl" : "NO_SOURCE",
":app:compileReleaseArtProfile" : "FROM_CACHE",
":app:compileReleaseJavaWithJavac" : "FROM_CACHE",
":app:compileReleaseKotlin" : "FROM_CACHE",
":app:compileReleaseRenderscript" : "FROM_CACHE",
":app:compileReleaseShaders" : "NO_SOURCE",
":app:compressDebugAssets" : "FROM_CACHE",
":app:compressReleaseAssets" : "FROM_CACHE",
":app:createDebugApkListingFileRedirect" : "SUCCESS",
":app:createDebugCompatibleScreenManifests" : "SUCCESS",
":app:createReleaseApkListingFileRedirect" : "SUCCESS",
":app:createReleaseCompatibleScreenManifests" : "SUCCESS",
":app:dataBindingGenBaseClassesDebug" : "FROM_CACHE",
":app:dataBindingGenBaseClassesRelease" : "FROM_CACHE",
":app:dataBindingMergeDependencyArtifactsDebug" : "SUCCESS",
":app:dataBindingMergeDependencyArtifactsRelease" : "SUCCESS",
":app:dataBindingTriggerDebug" : "SUCCESS",
":app:dataBindingTriggerRelease" : "SUCCESS",
":app:desugarDebugFileDependencies" : "FROM_CACHE",
":app:desugarReleaseFileDependencies" : "FROM_CACHE",
":app:dexBuilderDebug" : "FROM_CACHE",
":app:dexBuilderRelease" : "FROM_CACHE",
":app:extractDeepLinksDebug" : "FROM_CACHE",
":app:extractDeepLinksRelease" : "FROM_CACHE",
":app:extractReleaseNativeSymbolTables" : "NO_SOURCE",
":app:generateDebugAssets" : "UP_TO_DATE",
":app:generateDebugBuildConfig" : "FROM_CACHE",
":app:generateDebugResources" : "UP_TO_DATE",
":app:generateDebugResValues" : "FROM_CACHE",
":app:generateReleaseAssets" : "UP_TO_DATE",
":app:generateReleaseBuildConfig" : "FROM_CACHE",
":app:generateReleaseResources" : "UP_TO_DATE",
":app:generateReleaseResValues" : "FROM_CACHE",
":app:javaPreCompileDebug" : "FROM_CACHE",
":app:javaPreCompileRelease" : "FROM_CACHE",
":app:kaptDebugKotlin" : "FROM_CACHE",
":app:kaptGenerateStubsDebugKotlin" : "FROM_CACHE",
":app:kaptGenerateStubsReleaseKotlin" : "FROM_CACHE",
":app:kaptReleaseKotlin" : "FROM_CACHE",
":app:mapDebugSourceSetPaths" : "SUCCESS",
":app:mapReleaseSourceSetPaths" : "SUCCESS",
":app:mergeDebugAssets" : "SUCCESS",
":app:mergeDebugJavaResource" : "SUCCESS",
":app:mergeDebugJniLibFolders" : "SUCCESS",
":app:mergeDebugNativeDebugMetadata" : "NO_SOURCE",
":app:mergeDebugNativeLibs" : "NO_SOURCE",
":app:mergeDebugResources" : "FROM_CACHE",
":app:mergeDebugShaders" : "SUCCESS",
":app:mergeDexRelease" : "FROM_CACHE",
":app:mergeExtDexDebug" : "FROM_CACHE",
":app:mergeExtDexRelease" : "FROM_CACHE",
":app:mergeLibDexDebug" : "FROM_CACHE",
":app:mergeProjectDexDebug" : "FROM_CACHE",
":app:mergeReleaseArtProfile" : "SUCCESS",
":app:mergeReleaseAssets" : "SUCCESS",
":app:mergeReleaseJavaResource" : "SUCCESS",
":app:mergeReleaseJniLibFolders" : "SUCCESS",
":app:mergeReleaseNativeDebugMetadata" : "NO_SOURCE",
":app:mergeReleaseNativeLibs" : "NO_SOURCE",
":app:mergeReleaseResources" : "FROM_CACHE",
":app:mergeReleaseShaders" : "SUCCESS",
":app:mergeRoomSchemaLocations" : "SUCCESS",
":app:optimizeReleaseResources" : "FROM_CACHE",
":app:packageDebug" : "SUCCESS",
":app:packageRelease" : "SUCCESS",
":app:preBuild" : "UP_TO_DATE",
":app:preDebugBuild" : "UP_TO_DATE",
":app:preReleaseBuild" : "UP_TO_DATE",
":app:processDebugJavaRes" : "NO_SOURCE",
":app:processDebugMainManifest" : "FROM_CACHE",
":app:processDebugManifest" : "FROM_CACHE",
":app:processDebugManifestForPackage" : "FROM_CACHE",
":app:processDebugResources" : "FROM_CACHE",
":app:processReleaseJavaRes" : "NO_SOURCE",
":app:processReleaseMainManifest" : "FROM_CACHE",
":app:processReleaseManifest" : "FROM_CACHE",
":app:processReleaseManifestForPackage" : "FROM_CACHE",
":app:processReleaseResources" : "FROM_CACHE",
":app:sdkReleaseDependencyData" : "SUCCESS",
":app:stripDebugDebugSymbols" : "NO_SOURCE",
":app:stripReleaseDebugSymbols" : "NO_SOURCE",
":app:validateSigningDebug" : "SUCCESS",
":app:writeDebugAppMetadata" : "SUCCESS",
":app:writeDebugSigningConfigVersions" : "SUCCESS",
":app:writeReleaseAppMetadata" : "SUCCESS",
":app:writeReleaseSigningConfigVersions" : "SUCCESS",
":library:assemble" : "SUCCESS",
":library:assembleDebug" : "SUCCESS",
":library:assembleRelease" : "SUCCESS",
":library:bundleDebugAar" : "SUCCESS",
":library:bundleLibCompileToJarDebug" : "SUCCESS",
":library:bundleLibCompileToJarRelease" : "SUCCESS",
":library:bundleLibResDebug" : "SUCCESS",
":library:bundleLibResRelease" : "SUCCESS",
":library:bundleLibRuntimeToDirDebug" : "SUCCESS",
":library:bundleLibRuntimeToDirRelease" : "SUCCESS",
":library:bundleLibRuntimeToJarDebug" : "SUCCESS",
":library:bundleLibRuntimeToJarRelease" : "SUCCESS",
":library:bundleReleaseAar" : "SUCCESS",
":library:compileDebugAidl" : "NO_SOURCE",
":library:compileDebugJavaWithJavac" : "FROM_CACHE",
":library:compileDebugKotlin" : "FROM_CACHE",
":library:compileDebugLibraryResources" : "FROM_CACHE",
":library:compileDebugRenderscript" : "FROM_CACHE",
":library:compileDebugShaders" : "NO_SOURCE",
":library:compileReleaseAidl" : "NO_SOURCE",
":library:compileReleaseJavaWithJavac" : "FROM_CACHE",
":library:compileReleaseKotlin" : "FROM_CACHE",
":library:compileReleaseLibraryResources" : "FROM_CACHE",
":library:compileReleaseRenderscript" : "FROM_CACHE",
":library:compileReleaseShaders" : "NO_SOURCE",
":library:copyDebugJniLibsProjectAndLocalJars" : "SUCCESS",
":library:copyDebugJniLibsProjectOnly" : "SUCCESS",
":library:copyReleaseJniLibsProjectAndLocalJars" : "SUCCESS",
":library:copyReleaseJniLibsProjectOnly" : "SUCCESS",
":library:createFullJarDebug" : "SUCCESS",
":library:createFullJarRelease" : "SUCCESS",
":library:dataBindingGenBaseClassesDebug" : "FROM_CACHE",
":library:dataBindingGenBaseClassesRelease" : "FROM_CACHE",
":library:dataBindingMergeDependencyArtifactsDebug" : "SUCCESS",
":library:dataBindingMergeDependencyArtifactsRelease": "SUCCESS",
":library:dataBindingTriggerDebug" : "SUCCESS",
":library:dataBindingTriggerRelease" : "SUCCESS",
":library:extractDebugAnnotations" : "FROM_CACHE",
":library:extractDeepLinksDebug" : "FROM_CACHE",
":library:extractDeepLinksForAarDebug" : "FROM_CACHE",
":library:extractDeepLinksForAarRelease" : "FROM_CACHE",
":library:extractDeepLinksRelease" : "FROM_CACHE",
":library:extractReleaseAnnotations" : "FROM_CACHE",
":library:generateDebugAssets" : "UP_TO_DATE",
":library:generateDebugBuildConfig" : "FROM_CACHE",
":library:generateDebugResources" : "UP_TO_DATE",
":library:generateDebugResValues" : "FROM_CACHE",
":library:generateDebugRFile" : "FROM_CACHE",
":library:generateReleaseAssets" : "UP_TO_DATE",
":library:generateReleaseBuildConfig" : "FROM_CACHE",
":library:generateReleaseResources" : "UP_TO_DATE",
":library:generateReleaseResValues" : "FROM_CACHE",
":library:generateReleaseRFile" : "FROM_CACHE",
":library:javaPreCompileDebug" : "FROM_CACHE",
":library:javaPreCompileRelease" : "FROM_CACHE",
":library:kaptDebugKotlin" : "FROM_CACHE",
":library:kaptGenerateStubsDebugKotlin" : "FROM_CACHE",
":library:kaptGenerateStubsReleaseKotlin" : "FROM_CACHE",
":library:kaptReleaseKotlin" : "FROM_CACHE",
":library:mapReleaseSourceSetPaths" : "SUCCESS",
":library:mergeDebugConsumerProguardFiles" : "SUCCESS",
":library:mergeDebugGeneratedProguardFiles" : "SUCCESS",
":library:mergeDebugJavaResource" : "SUCCESS",
":library:mergeDebugJniLibFolders" : "SUCCESS",
":library:mergeDebugNativeLibs" : "NO_SOURCE",
":library:mergeDebugShaders" : "SUCCESS",
":library:mergeReleaseConsumerProguardFiles" : "SUCCESS",
":library:mergeReleaseGeneratedProguardFiles" : "SUCCESS",
":library:mergeReleaseJavaResource" : "SUCCESS",
":library:mergeReleaseJniLibFolders" : "SUCCESS",
":library:mergeReleaseNativeLibs" : "NO_SOURCE",
":library:mergeReleaseResources" : "FROM_CACHE",
":library:mergeReleaseShaders" : "SUCCESS",
":library:mergeRoomSchemaLocations" : "SUCCESS",
":library:packageDebugAssets" : "SUCCESS",
":library:packageDebugRenderscript" : "NO_SOURCE",
":library:packageDebugResources" : "FROM_CACHE",
":library:packageReleaseAssets" : "SUCCESS",
":library:packageReleaseRenderscript" : "NO_SOURCE",
":library:packageReleaseResources" : "FROM_CACHE",
":library:parseDebugLocalResources" : "FROM_CACHE",
":library:parseReleaseLocalResources" : "FROM_CACHE",
":library:preBuild" : "UP_TO_DATE",
":library:preDebugBuild" : "UP_TO_DATE",
":library:prepareDebugArtProfile" : "SUCCESS",
":library:prepareLintJarForPublish" : "SUCCESS",
":library:prepareReleaseArtProfile" : "SUCCESS",
":library:preReleaseBuild" : "UP_TO_DATE",
":library:processDebugJavaRes" : "NO_SOURCE",
":library:processDebugManifest" : "FROM_CACHE",
":library:processReleaseJavaRes" : "NO_SOURCE",
":library:processReleaseManifest" : "FROM_CACHE",
":library:stripDebugDebugSymbols" : "NO_SOURCE",
":library:stripReleaseDebugSymbols" : "NO_SOURCE",
":library:syncDebugLibJars" : "FROM_CACHE",
":library:syncReleaseLibJars" : "FROM_CACHE",
":library:verifyReleaseResources" : "UNKNOWN",
":library:writeDebugAarMetadata" : "SUCCESS",
":library:writeReleaseAarMetadata" : "SUCCESS"
}

0 comments on commit 3cfde3e

Please sign in to comment.