Skip to content

Commit e1e67f6

Browse files
ghaleghale
committed
Update to the latest Gradle 7.0 nightly
1 parent 0b8cbca commit e1e67f6

File tree

6 files changed

+29
-17
lines changed

6 files changed

+29
-17
lines changed

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ 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-beta04": ["6.8.1", "7.0-20210119173355+0000"],
16+
"4.2.0-beta04": ["6.8.1", "7.0-20210202230337+0000"],
1717
"4.1.2": ["6.5.1", "6.8.1"],
1818
"4.0.2": ["6.1.1", "6.8.1"],
1919
"3.6.4": ["5.6.4", "6.8.1"],

‎src/main/groovy/org/gradle/android/Versions.groovy‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,14 @@ class Versions {
5353
return SUPPORTED_GRADLE_VERSIONS.max()
5454
}
5555

56+
static GradleVersion latestSupportedGradleVersionFor(String androidVersion) {
57+
return latestSupportedGradleVersionFor(VersionNumber.parse(androidVersion))
58+
}
59+
60+
static GradleVersion latestSupportedGradleVersionFor(VersionNumber androidVersion) {
61+
return SUPPORTED_VERSIONS_MATRIX.asMap().find {it.key.major == androidVersion.major && it.key.minor == androidVersion.minor }.value.max()
62+
}
63+
5664
static VersionNumber getLatestVersionForAndroid(String version) {
5765
VersionNumber versionNumber = VersionNumber.parse(version)
5866
return SUPPORTED_ANDROID_VERSIONS.findAll { it.major == versionNumber.major && it.minor == versionNumber.minor }.max()

‎src/test/groovy/org/gradle/android/MergeJavaResourcesWorkaroundTest.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class MergeJavaResourcesWorkaroundTest extends AbstractTest {
2020
cacheDir.mkdirs()
2121
2222
when:
23-
BuildResult buildResult = withGradleVersion(Versions.latestGradleVersion().version)
23+
BuildResult buildResult = withGradleVersion(Versions.latestSupportedGradleVersionFor(androidVersion).version)
2424
.forwardOutput()
2525
.withProjectDir(temporaryFolder.root)
2626
.withArguments("assemble", "--stacktrace")

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,15 @@ class PluginApplicationTest extends AbstractTest {
2727
}
2828

2929
def "warns when version is not supported but within range"() {
30+
def notLatestPatchAndroidVersion = "3.6.1"
3031
def projectDir = temporaryFolder.newFolder()
3132
SimpleAndroidApp.builder(projectDir, cacheDir)
32-
.withAndroidVersion("3.6.1")
33+
.withAndroidVersion(notLatestPatchAndroidVersion)
3334
.build()
3435
.writeProject()
3536

3637
expect:
37-
def result = withGradleVersion(Versions.latestGradleVersion().version)
38+
def result = withGradleVersion(Versions.latestSupportedGradleVersionFor(notLatestPatchAndroidVersion).version)
3839
.withProjectDir(projectDir)
3940
.withArguments("tasks", "--stacktrace")
4041
.build()

‎src/test/groovy/org/gradle/android/RoomSchemaLocationWorkaroundTest.groovy‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class RoomSchemaLocationWorkaroundTest extends AbstractTest {
2525
cacheDir.mkdirs()
2626
2727
when:
28-
BuildResult buildResult = withGradleVersion(Versions.latestGradleVersion().version)
28+
BuildResult buildResult = withGradleVersion(Versions.latestSupportedGradleVersionFor(androidVersion).version)
2929
.forwardOutput()
3030
.withProjectDir(temporaryFolder.root)
3131
.withArguments(CLEAN_BUILD)
@@ -48,7 +48,7 @@ class RoomSchemaLocationWorkaroundTest extends AbstractTest {
4848
assertMergedSchemaOutputsExist()
4949
5050
when:
51-
buildResult = withGradleVersion(Versions.latestGradleVersion().version)
51+
buildResult = withGradleVersion(Versions.latestSupportedGradleVersionFor(androidVersion).version)
5252
.forwardOutput()
5353
.withProjectDir(temporaryFolder.root)
5454
.withArguments(CLEAN_BUILD)
@@ -86,7 +86,7 @@ class RoomSchemaLocationWorkaroundTest extends AbstractTest {
8686
cacheDir.mkdirs()
8787
8888
when:
89-
BuildResult buildResult = withGradleVersion(Versions.latestGradleVersion().version)
89+
BuildResult buildResult = withGradleVersion(Versions.latestSupportedGradleVersionFor(androidVersion).version)
9090
.forwardOutput()
9191
.withProjectDir(temporaryFolder.root)
9292
.withArguments(CLEAN_BUILD)
@@ -109,7 +109,7 @@ class RoomSchemaLocationWorkaroundTest extends AbstractTest {
109109
assertMergedSchemaOutputsExist()
110110
111111
when:
112-
buildResult = withGradleVersion(Versions.latestGradleVersion().version)
112+
buildResult = withGradleVersion(Versions.latestSupportedGradleVersionFor(androidVersion).version)
113113
.forwardOutput()
114114
.withProjectDir(temporaryFolder.root)
115115
.withArguments(CLEAN_BUILD)
@@ -147,7 +147,7 @@ class RoomSchemaLocationWorkaroundTest extends AbstractTest {
147147
cacheDir.mkdirs()
148148
149149
when:
150-
BuildResult buildResult = withGradleVersion(Versions.latestGradleVersion().version)
150+
BuildResult buildResult = withGradleVersion(Versions.latestSupportedGradleVersionFor(androidVersion).version)
151151
.forwardOutput()
152152
.withProjectDir(temporaryFolder.root)
153153
.withArguments(CLEAN_BUILD)
@@ -167,7 +167,7 @@ class RoomSchemaLocationWorkaroundTest extends AbstractTest {
167167
assertMergedSchemaOutputsExist()
168168
169169
when:
170-
buildResult = withGradleVersion(Versions.latestGradleVersion().version)
170+
buildResult = withGradleVersion(Versions.latestSupportedGradleVersionFor(androidVersion).version)
171171
.forwardOutput()
172172
.withProjectDir(temporaryFolder.root)
173173
.withArguments(CLEAN_BUILD)
@@ -192,8 +192,9 @@ class RoomSchemaLocationWorkaroundTest extends AbstractTest {
192192
193193
@Unroll
194194
def "workaround is not applied with older Kotlin plugin version (Kotlin #kotlinVersion)"() {
195+
def androidVersion = Versions.getLatestVersionForAndroid("3.6")
195196
SimpleAndroidApp.builder(temporaryFolder.root, cacheDir)
196-
.withAndroidVersion(Versions.getLatestVersionForAndroid("3.6"))
197+
.withAndroidVersion(androidVersion)
197198
.withKotlinVersion(kotlinVersion)
198199
.withRoomProcessingArgumentConfigured()
199200
.build()
@@ -203,7 +204,7 @@ class RoomSchemaLocationWorkaroundTest extends AbstractTest {
203204
cacheDir.mkdirs()
204205
205206
when:
206-
BuildResult buildResult = withGradleVersion(Versions.latestGradleVersion().version)
207+
BuildResult buildResult = withGradleVersion(Versions.latestSupportedGradleVersionFor(androidVersion).version)
207208
.forwardOutput()
208209
.withProjectDir(temporaryFolder.root)
209210
.withArguments(CLEAN_BUILD + ['--info'] as String[])
@@ -230,8 +231,9 @@ class RoomSchemaLocationWorkaroundTest extends AbstractTest {
230231
}
231232
232233
def "workaround throws an exception when room extension is not configured, but annotation processor argument is"() {
234+
def androidVersion = Versions.getLatestVersionForAndroid("3.6")
233235
SimpleAndroidApp.builder(temporaryFolder.root, cacheDir)
234-
.withAndroidVersion(Versions.getLatestVersionForAndroid("3.6"))
236+
.withAndroidVersion(androidVersion)
235237
.withRoomProcessingArgumentConfigured()
236238
.build()
237239
.writeProject()
@@ -240,7 +242,7 @@ class RoomSchemaLocationWorkaroundTest extends AbstractTest {
240242
cacheDir.mkdirs()
241243
242244
when:
243-
BuildResult buildResult = withGradleVersion(Versions.latestGradleVersion().version)
245+
BuildResult buildResult = withGradleVersion(Versions.latestSupportedGradleVersionFor(androidVersion).version)
244246
.forwardOutput()
245247
.withProjectDir(temporaryFolder.root)
246248
.withArguments(CLEAN_BUILD)
@@ -251,8 +253,9 @@ class RoomSchemaLocationWorkaroundTest extends AbstractTest {
251253
}
252254
253255
def "builds with no errors when room extension is not configured and annotation processor argument is missing"() {
256+
def androidVersion = Versions.getLatestVersionForAndroid("3.6")
254257
SimpleAndroidApp.builder(temporaryFolder.root, cacheDir)
255-
.withAndroidVersion(Versions.getLatestVersionForAndroid("3.6"))
258+
.withAndroidVersion(androidVersion)
256259
.withNoRoomConfiguration()
257260
.build()
258261
.writeProject()
@@ -261,7 +264,7 @@ class RoomSchemaLocationWorkaroundTest extends AbstractTest {
261264
cacheDir.mkdirs()
262265
263266
when:
264-
BuildResult buildResult = withGradleVersion(Versions.latestGradleVersion().version)
267+
BuildResult buildResult = withGradleVersion(Versions.latestSupportedGradleVersionFor(androidVersion).version)
265268
.forwardOutput()
266269
.withProjectDir(temporaryFolder.root)
267270
.withArguments(CLEAN_BUILD)

‎src/test/groovy/org/gradle/android/SimpleAndroidApp.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class SimpleAndroidApp {
3636

3737
file("settings.gradle") << """
3838
buildCache {
39-
local(DirectoryBuildCache) {
39+
local {
4040
directory = "${cacheDir.absolutePath.replace(File.separatorChar, '/' as char)}"
4141
}
4242
}

0 commit comments

Comments
 (0)