Skip to content

Commit a0bc9ee

Browse files
committed
Upgrade to Gradle 6.1 (elastic#50453)
(cherry picked from commit bdd7bda)
1 parent 606e444 commit a0bc9ee

File tree

5 files changed

+3
-12
lines changed

5 files changed

+3
-12
lines changed

.ci/java-versions.properties

-3
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,3 @@ ES_BUILD_JAVA=openjdk13
88
ES_RUNTIME_JAVA=java8
99
GRADLE_TASK=build
1010
GRADLE_EXTRA_ARGS=
11-
12-
# Workaround for https://github.com/gradle/gradle/issues/11426
13-
OPENSHIFT_IP=0.0.0.0
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
6.0.1
1+
6.1

distribution/bwc/build.gradle

-6
Original file line numberDiff line numberDiff line change
@@ -162,12 +162,6 @@ bwcVersions.forPreviousUnreleased { BwcVersions.UnreleasedVersionInfo unreleased
162162
spoolOutput = true
163163
workingDir = checkoutDir
164164
doFirst {
165-
// TODO: Remove this once we've updated to Gradle 6.1
166-
// Workaround for https://github.com/gradle/gradle/issues/11426
167-
if (GradleVersion.version(file("${ checkoutDir}/buildSrc/src/main/resources/minimumGradleVersion").text.trim()) != GradleVersion.current()) {
168-
environment = environment.findAll { key, val -> key != 'OPENSHIFT_IP' }
169-
}
170-
171165
// Execution time so that the checkouts are available
172166
List<String> lines = file("${checkoutDir}/.ci/java-versions.properties").readLines()
173167
environment(

gradle/wrapper/gradle-wrapper.jar

-7 Bytes
Binary file not shown.
+2-2
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-6.0.1-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionSha256Sum=6f6cfdbb12a577c3845522a1c7fbfe1295ea05d87edabedd4e23fd2bf02b88b1
6+
distributionSha256Sum=634f972af958e3c753aeb42d7a688fab6820b527a0aef9eed03d7f3f6f9c7c06

0 commit comments

Comments
 (0)