From 9229b87bd22d1a918ab2026263272e9bd373572a Mon Sep 17 00:00:00 2001
From: Alpar Torok <torokalpar@gmail.com>
Date: Thu, 12 Sep 2019 16:04:09 +0300
Subject: [PATCH] Upgrade to Gradle 5.6 (#45005)

* Upgrade to Gradle 5.6.2
---
 .../src/main/java/org/elasticsearch/gradle/EmptyDirTask.java  | 2 +-
 buildSrc/src/main/resources/minimumGradleVersion              | 2 +-
 gradle/wrapper/gradle-wrapper.properties                      | 4 ++--
 gradlew                                                       | 4 ++--
 settings.gradle                                               | 2 --
 5 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/EmptyDirTask.java b/buildSrc/src/main/java/org/elasticsearch/gradle/EmptyDirTask.java
index ec9b774767c..4ee2192ff34 100644
--- a/buildSrc/src/main/java/org/elasticsearch/gradle/EmptyDirTask.java
+++ b/buildSrc/src/main/java/org/elasticsearch/gradle/EmptyDirTask.java
@@ -25,7 +25,7 @@ import javax.inject.Inject;
 import org.gradle.api.DefaultTask;
 import org.gradle.api.tasks.Input;
 import org.gradle.api.tasks.TaskAction;
-import org.gradle.internal.nativeintegration.filesystem.Chmod;
+import org.gradle.internal.file.Chmod;
 
 /**
  * Creates an empty directory.
diff --git a/buildSrc/src/main/resources/minimumGradleVersion b/buildSrc/src/main/resources/minimumGradleVersion
index e5e7441d3e9..475e1842948 100644
--- a/buildSrc/src/main/resources/minimumGradleVersion
+++ b/buildSrc/src/main/resources/minimumGradleVersion
@@ -1 +1 @@
-5.5
\ No newline at end of file
+5.6.2
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 9fabbb9bd78..fe8ba436dc1 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionSha256Sum=302b7df46730ce75c582542c056c9bf5cac2b94fbf2cc656d0e37e41e8a5d371
+distributionSha256Sum=027fdd265d277bae65a0d349b6b8da02135b0b8e14ba891e26281fa877fe37a2
diff --git a/gradlew b/gradlew
index 8e25e6c19d5..83f2acfdc31 100755
--- a/gradlew
+++ b/gradlew
@@ -125,8 +125,8 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
     JAVACMD=`cygpath --unix "$JAVACMD"`
diff --git a/settings.gradle b/settings.gradle
index 5337e321f3f..244d29c6a0c 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,5 +1,3 @@
-import org.elasticsearch.gradle.Version
-
 String dirName = rootProject.projectDir.name
 rootProject.name = dirName