Skip to content

Support Android 3.1.0-beta4 #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 26, 2018
Merged

Support Android 3.1.0-beta4 #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,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.

* Supported Gradle versions: 4.1+
* Supported Android versions: 3.0.0, 3.0.1, 3.1.0-beta3, 3.2.0-alpha01
* Supported Android versions: 3.0.0, 3.0.1, 3.1.0-beta4, 3.2.0-alpha01

**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.

Expand Down
8 changes: 4 additions & 4 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ version = ["git", "describe", "--match", "[0-9]*", "--dirty"].execute().text.tri

// Maps supported Android plugin versions to the versions of Gradle that support it
def supportedVersions = [
"3.2.0-alpha01": ["4.5", "4.5.1"],
"3.1.0-beta3": ["4.4", "4.4.1", "4.5", "4.5.1"],
"3.0.0": ["4.1", "4.2", "4.2.1", "4.3", "4.3.1", "4.4", "4.4.1", "4.5", "4.5.1"],
"3.0.1": ["4.1", "4.2", "4.2.1", "4.3", "4.3.1", "4.4", "4.4.1", "4.5", "4.5.1"],
"3.2.0-alpha01": ["4.5.1"],
"3.1.0-beta4": ["4.4.1", "4.5.1"],
"3.0.0": ["4.1", "4.2.1", "4.3.1", "4.4.1", "4.5.1"],
"3.0.1": ["4.1", "4.2.1", "4.3.1", "4.4.1", "4.5.1"],
]

repositories {
Expand Down
4 changes: 2 additions & 2 deletions src/test/groovy/org/gradle/android/PluginApplicationTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ class PluginApplicationTest extends AbstractTest {
false | false | "3.0.0"
false | true | "3.0.1"
false | false | "3.0.1"
false | true | "3.1.0-beta3"
true | false | "3.1.0-beta3"
false | true | "3.1.0-beta4"
true | false | "3.1.0-beta4"
false | true | "3.2.0-alpha01"
true | false | "3.2.0-alpha01"
description = warns ? "warn" : "not warn"
Expand Down
1 change: 1 addition & 0 deletions src/test/groovy/org/gradle/android/WorkaroundTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ class WorkaroundTest extends Specification {
"3.1.0-beta1" | ["DataBindingDependencyArtifacts"]
"3.1.0-beta2" | ["DataBindingDependencyArtifacts"]
"3.1.0-beta3" | ["DataBindingDependencyArtifacts"]
"3.1.0-beta4" | ["DataBindingDependencyArtifacts"]
"3.2.0-alpha01" | ["DataBindingDependencyArtifacts"]
}
}