Skip to content

Commit 3594e5d

Browse files
authored
Merge pull request #199 from gradle/no/support-7.1
Add missing 7.1 test.
2 parents 26a5c02 + bb3e02b commit 3594e5d

File tree

4 files changed

+7
-27
lines changed

4 files changed

+7
-27
lines changed

.travis.yml

-21
This file was deleted.

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
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.
77

88
* Supported Gradle versions: 5.4.1+
9-
* Supported Android Gradle Plugin versions: 3.5.4, 3.6.4, 4.0.1, 4.1.3, 4.2.2, 7.0.1
9+
* Supported Android Gradle Plugin versions: 3.5.4, 3.6.4, 4.0.1, 4.1.3, 4.2.2, 7.0.2, 7.1.0-alpha11
1010
* Supported Kotlin versions: 1.3.70+
1111

1212
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

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ plugins {
66
id 'java-gradle-plugin'
77
id 'maven-publish'
88
id 'codenarc'
9-
id "com.gradle.plugin-publish" version "0.14.0"
10-
id "org.gradle.test-retry" version "1.2.0"
9+
id "com.gradle.plugin-publish" version "0.16.0"
10+
id "org.gradle.test-retry" version "1.3.1"
1111
}
1212

1313
group = "org.gradle.android"
@@ -17,8 +17,8 @@ def isCI = (System.getenv('CI') ?: 'false').toBoolean()
1717

1818
// Maps supported Android plugin versions to the versions of Gradle that support it
1919
def supportedVersions = [
20-
"7.1.0-alpha09": ["7.2"],
21-
"7.0.1": ["7.2"],
20+
"7.1.0-alpha11": ["7.2"],
21+
"7.0.2": ["7.2"],
2222
"4.2.2": ["6.8.3", "7.2"],
2323
"4.1.3": ["6.5.1", "6.8.3"],
2424
"4.0.2": ["6.1.1", "6.8.3"],

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ class WorkaroundTest extends Specification {
1212
workarounds.collect { it.class.simpleName.replaceAll(/Workaround/, "") }.sort() == expectedWorkarounds.sort()
1313
where:
1414
androidVersion | expectedWorkarounds
15-
"7.0.1" | ['MergeSourceSetFolders', 'MergeJavaResources', 'RoomSchemaLocation', 'StripDebugSymbols', 'MergeNativeLibs', 'CompileLibraryResources_7_0']
15+
"7.1.0-alpha11" | ['MergeSourceSetFolders', 'MergeJavaResources', 'RoomSchemaLocation', 'StripDebugSymbols', 'MergeNativeLibs', 'CompileLibraryResources_7_0']
16+
"7.0.2" | ['MergeSourceSetFolders', 'MergeJavaResources', 'RoomSchemaLocation', 'StripDebugSymbols', 'MergeNativeLibs', 'CompileLibraryResources_7_0']
1617
"4.2.2" | ['MergeSourceSetFolders', 'MergeJavaResources', 'RoomSchemaLocation', 'StripDebugSymbols', 'MergeNativeLibs', 'CompileLibraryResources_4_2', 'MergeResources']
1718
"4.1.3" | ['MergeSourceSetFolders', 'MergeJavaResources', 'RoomSchemaLocation', 'StripDebugSymbols', 'MergeNativeLibs', 'CompileLibraryResources_4_0', 'MergeResources']
1819
"4.0.2" | ['MergeSourceSetFolders', 'MergeJavaResources', 'RoomSchemaLocation', 'StripDebugSymbols', 'MergeNativeLibs', 'CompileLibraryResources_4_0', 'MergeResources']

0 commit comments

Comments
 (0)