Skip to content

Commit b43fe56

Browse files
authored
Updates the build to gradle 4.9 (#32087)
There are fixes to the dependency report, most importantly for us, it still works even if `failOnVersionConflict` would fail the build.
1 parent b655c11 commit b43fe56

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -596,7 +596,7 @@ if (System.properties.get("build.compare") != null) {
596596
}
597597
}
598598
sourceBuild {
599-
gradleVersion = "4.8.1" // does not default to gradle weapper of project dir, but current version
599+
gradleVersion = gradle.getGradleVersion()
600600
projectDir = referenceProject
601601
tasks = ["clean", "assemble"]
602602
arguments = ["-Dbuild.compare_friendly=true"]

buildSrc/src/main/groovy/com/carrotsearch/gradle/junit4/RandomizedTestingPlugin.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ class RandomizedTestingPlugin implements Plugin<Project> {
7474
// since we can't be sure if the task was ever realized, we remove both the provider and the task
7575
TaskProvider<Test> oldTestProvider
7676
try {
77-
oldTestProvider = tasks.getByNameLater(Test, 'test')
77+
oldTestProvider = tasks.named('test')
7878
} catch (UnknownTaskException unused) {
7979
// no test task, ok, user will use testing task on their own
8080
return
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionSha256Sum=ce1645ff129d11aad62dab70d63426fdce6cfd646fa309dc5dc5255dd03c7c11
6+
distributionSha256Sum=39e2d5803bbd5eaf6c8efe07067b0e5a00235e8c71318642b2ed262920b27721

0 commit comments

Comments
 (0)