Skip to content

Commit 522e765

Browse files
committed
Support 4.2.0-beta03, 4.1.2
Also update README
1 parent cda46ed commit 522e765

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
# Android cache fix Gradle plugin
22

33
![CI](https://github.com/gradle/android-cache-fix-gradle-plugin/workflows/CI/badge.svg?branch=master)
4+
![Plugin Portal](https://img.shields.io/maven-metadata/v?metadataUrl=https://plugins.gradle.org/m2/gradle/plugin/org/gradle/android/android-cache-fix-gradle-plugin/maven-metadata.xml&label=Plugin%20Portal)
45

56
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.
67

78
* Supported Gradle versions: 5.4.1+
8-
* Supported Android Gradle Plugin versions: 3.5.4, 3.6.4, 4.0.1, 4.1.0-rc3, 4.2.0-alpha12
9+
* Supported Android Gradle Plugin versions: 3.5.4, 3.6.4, 4.0.1, 4.1.2, 4.2.0-beta03
910
* Supported Kotlin versions: 1.3.70+
1011

1112
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 3.6.2), 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.

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ version = ["git", "describe", "--match", "[0-9]*", "--dirty"].execute().text.tri
1313

1414
// Maps supported Android plugin versions to the versions of Gradle that support it
1515
def supportedVersions = [
16-
"4.2.0-beta01": ["6.7.1"],
17-
"4.1.1": ["6.5.1"],
16+
"4.2.0-beta03": ["6.7.1"],
17+
"4.1.2": ["6.5.1"],
1818
"4.0.2": ["6.1.1", "6.3", "6.4.1"],
1919
"3.6.4": ["5.6.4", "6.3", "6.4.1"],
2020
"3.5.4": ["5.4.1", "5.6.4", "6.3", "6.4.1"]

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ class WorkaroundTest extends Specification {
1313
workarounds.collect { it.class.simpleName.replaceAll(/Workaround/, "") }.sort() == expectedWorkarounds.sort()
1414
where:
1515
androidVersion | expectedWorkarounds
16-
"4.2.0-beta01" | ['RoomSchemaLocation', 'CompileLibraryResources_4_2', 'MergeResources', 'DexFileDependencies']
17-
"4.1.1" | ['RoomSchemaLocation', 'CompileLibraryResources_4_0', 'MergeResources', 'DexFileDependencies']
16+
"4.2.0-beta03" | ['RoomSchemaLocation', 'CompileLibraryResources_4_2', 'MergeResources', 'DexFileDependencies']
17+
"4.1.2" | ['RoomSchemaLocation', 'CompileLibraryResources_4_0', 'MergeResources', 'DexFileDependencies']
1818
"4.0.2" | ['MergeJavaResources', 'MergeNativeLibs', 'RoomSchemaLocation', 'CompileLibraryResources_4_0', 'MergeResources', 'DexFileDependencies']
1919
"3.6.4" | ['MergeJavaResources', 'MergeNativeLibs', 'RoomSchemaLocation', 'DexFileDependencies']
2020
"3.5.4" | ['MergeJavaResources', 'RoomSchemaLocation', 'DexFileDependencies']

0 commit comments

Comments
 (0)