Skip to content

Upgrade to Gradle 6.1 #50453

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 6 commits into from
Jan 16, 2020
Merged

Upgrade to Gradle 6.1 #50453

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a050994
Upgrade to Gradle 6.1-rc-1
mark-vieira Dec 20, 2019
4d3e0a3
Remove IP binding workaround
mark-vieira Dec 20, 2019
dd6e880
Upgrade to latest Gradle release candidate
mark-vieira Jan 13, 2020
4cce88c
Merge branch 'master' into gradle-6.1-upgrade
elasticmachine Jan 13, 2020
7f14702
Upgrade to Gradle 6.1 final release
mark-vieira Jan 16, 2020
cb9600c
Merge branch 'master' into gradle-6.1-upgrade
elasticmachine Jan 16, 2020
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
3 changes: 0 additions & 3 deletions .ci/java-versions.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,3 @@
ES_BUILD_JAVA=openjdk13
ES_RUNTIME_JAVA=openjdk11
GRADLE_TASK=build

# Workaround for https://github.com/gradle/gradle/issues/11426
OPENSHIFT_IP=0.0.0.0
2 changes: 1 addition & 1 deletion buildSrc/src/main/resources/minimumGradleVersion
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6.0.1
6.1
6 changes: 0 additions & 6 deletions distribution/bwc/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,12 +162,6 @@ bwcVersions.forPreviousUnreleased { BwcVersions.UnreleasedVersionInfo unreleased
spoolOutput = true
workingDir = checkoutDir
doFirst {
// TODO: Remove this once we've updated to Gradle 6.1
// Workaround for https://github.com/gradle/gradle/issues/11426
if (GradleVersion.version(file("${ checkoutDir}/buildSrc/src/main/resources/minimumGradleVersion").text) != GradleVersion.current()) {
environment = environment.findAll { key, val -> key != 'OPENSHIFT_IP' }
}

// Execution time so that the checkouts are available
List<String> lines = file("${checkoutDir}/.ci/java-versions.properties").readLines()
environment(
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionSha256Sum=6f6cfdbb12a577c3845522a1c7fbfe1295ea05d87edabedd4e23fd2bf02b88b1
distributionSha256Sum=634f972af958e3c753aeb42d7a688fab6820b527a0aef9eed03d7f3f6f9c7c06