From 1d9d3fdf7c35260822ef998bdb7e7b091ae223a1 Mon Sep 17 00:00:00 2001 From: Jerome Prinet Date: Fri, 14 Oct 2022 16:06:39 +0200 Subject: [PATCH] Add AGP 7.3.1 support --- README.md | 2 +- release/changes.md | 3 ++- src/main/resources/versions.json | 2 +- src/test/groovy/org/gradle/android/WorkaroundTest.groovy | 2 +- .../{7.3.0_outcomes.json => 7.3.1_outcomes.json} | 0 5 files changed, 5 insertions(+), 4 deletions(-) rename src/test/resources/expectedOutcomes/{7.3.0_outcomes.json => 7.3.1_outcomes.json} (100%) diff --git a/README.md b/README.md index c2065984..9ac6e7fc 100644 --- a/README.md +++ b/README.md @@ -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.2, 7.3.0, 7.4.0-beta02, 8.0.0-alpha03 +* 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 * 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. diff --git a/release/changes.md b/release/changes.md index 15b6f285..1d2f871f 100644 --- a/release/changes.md +++ b/release/changes.md @@ -1 +1,2 @@ -- [NEW] - Support AGP `7.4.0-beta02` and `8.0.0-alpha03` \ No newline at end of file +- [NEW] - Support AGP `7.4.0-beta02` and `8.0.0-alpha03` +- [NEW] - Support AGP `7.3.1` \ No newline at end of file diff --git a/src/main/resources/versions.json b/src/main/resources/versions.json index 87644ba5..09455918 100644 --- a/src/main/resources/versions.json +++ b/src/main/resources/versions.json @@ -6,7 +6,7 @@ "7.4.0-beta02": [ "7.5.1" ], - "7.3.0": [ + "7.3.1": [ "7.4.2", "7.5.1" ], diff --git a/src/test/groovy/org/gradle/android/WorkaroundTest.groovy b/src/test/groovy/org/gradle/android/WorkaroundTest.groovy index c739ece8..4b6faa2a 100644 --- a/src/test/groovy/org/gradle/android/WorkaroundTest.groovy +++ b/src/test/groovy/org/gradle/android/WorkaroundTest.groovy @@ -14,7 +14,7 @@ class WorkaroundTest extends Specification { androidVersion | expectedWorkarounds "8.0.0-alpha03" | ['MergeSourceSetFolders', 'RoomSchemaLocation', 'ZipMergingTask'] "7.4.0-beta02" | ['MergeSourceSetFolders', 'RoomSchemaLocation', 'ZipMergingTask'] - "7.3.0" | ['MergeSourceSetFolders', 'RoomSchemaLocation', 'ZipMergingTask', 'JdkImage'] + "7.3.1" | ['MergeSourceSetFolders', 'RoomSchemaLocation', 'ZipMergingTask', 'JdkImage'] "7.2.2" | ['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'] diff --git a/src/test/resources/expectedOutcomes/7.3.0_outcomes.json b/src/test/resources/expectedOutcomes/7.3.1_outcomes.json similarity index 100% rename from src/test/resources/expectedOutcomes/7.3.0_outcomes.json rename to src/test/resources/expectedOutcomes/7.3.1_outcomes.json