Skip to content

Commit 3d7f20c

Browse files
authored
Merge pull request #29 from gradle/lptr/support-android-3.1.0-alpha07
Support Android 3.1.0-alpha07
2 parents 637532d + b88ed0d commit 3d7f20c

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ version = ["git", "describe", "--match", "[0-9]*", "--dirty"].execute().text.tri
2222

2323
// Maps supported Android plugin versions to the versions of Gradle that support it
2424
def supportedVersions = [
25-
"3.1.0-alpha06": ["4.4", "4.4.1"],
25+
"3.1.0-alpha07": ["4.4", "4.4.1"],
2626
"3.0.0": ["4.1", "4.2", "4.2.1", "4.3", "4.3.1", "4.4", "4.4.1"],
2727
"3.0.1": ["4.1", "4.2", "4.2.1", "4.3", "4.3.1", "4.4", "4.4.1"],
2828
]

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,8 @@ class RelocationTest extends AbstractTest {
5656
relocatedDir.deleteDir()
5757

5858
where:
59-
[androidVersion, gradleVersion] << Versions.SUPPORTED_VERSIONS_MATRIX.entries().collect { [it.key, it.value] }
59+
//[androidVersion, gradleVersion] << Versions.SUPPORTED_VERSIONS_MATRIX.entries().collect { [it.key, it.value] }
60+
[androidVersion, gradleVersion] << [[android("3.1.0-alpha07"), gradle("4.4.1")]]
6061
}
6162

6263
static class ExpectedResults {

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,6 @@ class WorkaroundTest extends Specification {
2020
"3.1.0-alpha04" | ["AndroidJavaCompile_BootClasspath", "AndroidJavaCompile_AnnotationProcessorSource", "CheckManifest_Manifest", "DataBindingDependencyArtifacts"]
2121
"3.1.0-alpha05" | ["AndroidJavaCompile_BootClasspath", "AndroidJavaCompile_AnnotationProcessorSource", "DataBindingDependencyArtifacts"]
2222
"3.1.0-alpha06" | ["DataBindingDependencyArtifacts"]
23+
"3.1.0-alpha07" | ["DataBindingDependencyArtifacts"]
2324
}
2425
}

0 commit comments

Comments
 (0)