Skip to content

Commit 2128bd4

Browse files
authored
Merge pull request #50 from gradle/lptr/support-android-3.1.0-rc02
Support Android 3.1.0-rc02
2 parents 484c24d + 66a91fb commit 2128bd4

File tree

4 files changed

+5
-4
lines changed

4 files changed

+5
-4
lines changed

README.md

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

77
* Supported Gradle versions: 4.1+
8-
* Supported Android versions: 3.0.0, 3.0.1, 3.1.0-rc01, 3.2.0-alpha01
8+
* Supported Android versions: 3.0.0, 3.0.1, 3.1.0-rc02, 3.2.0-alpha01
99

1010
**Note:** With Android 3.1.x and 3.2.x the cache-fix plugin is only required if you are using Android's data binding feature.
1111

build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ version = ["git", "describe", "--match", "[0-9]*", "--dirty"].execute().text.tri
2323
// Maps supported Android plugin versions to the versions of Gradle that support it
2424
def supportedVersions = [
2525
"3.2.0-alpha01": ["4.5.1", "4.6"],
26-
"3.1.0-rc01": ["4.4.1", "4.5.1", "4.6"],
26+
"3.1.0-rc02": ["4.4.1", "4.5.1", "4.6"],
2727
"3.0.0": ["4.1", "4.2.1", "4.3.1", "4.4.1", "4.5.1", "4.6"],
2828
"3.0.1": ["4.1", "4.2.1", "4.3.1", "4.4.1", "4.5.1", "4.6"],
2929
]

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ class PluginApplicationTest extends AbstractTest {
4646
false | false | "3.0.0"
4747
false | true | "3.0.1"
4848
false | false | "3.0.1"
49-
false | true | "3.1.0-rc01"
50-
true | false | "3.1.0-rc01"
49+
false | true | "3.1.0-rc02"
50+
true | false | "3.1.0-rc02"
5151
false | true | "3.2.0-alpha01"
5252
true | false | "3.2.0-alpha01"
5353
description = warns ? "warn" : "not warn"

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

+1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ class WorkaroundTest extends Specification {
2828
"3.1.0-beta3" | ["DataBindingDependencyArtifacts"]
2929
"3.1.0-beta4" | ["DataBindingDependencyArtifacts"]
3030
"3.1.0-rc01" | ["DataBindingDependencyArtifacts"]
31+
"3.1.0-rc02" | ["DataBindingDependencyArtifacts"]
3132
"3.2.0-alpha01" | ["DataBindingDependencyArtifacts"]
3233
}
3334
}

0 commit comments

Comments
 (0)