From b1c954b1f1002168369ac2378135705acc38773b Mon Sep 17 00:00:00 2001
From: Frieder Bluemle <frieder.bluemle@gmail.com>
Date: Fri, 6 Sep 2019 00:24:10 -0700
Subject: [PATCH] Update Gradle wrapper to 5.6.2 (#26349)

Summary:
Gradle wrapper `5.6.2`

Supersedes and closes https://github.com/facebook/react-native/issues/26227

## Changelog

[Android] [Changed] - Gradle wrapper 5.6.2
Pull Request resolved: https://github.com/facebook/react-native/pull/26349

Test Plan: Builds successfully (just like the current `master` branch, **only** after either reverting 4763000554c71be40b82a740651706781acad2e3 **or** cherry-picking 7f238785ec898560c276d1d37b4c88b7018c245b from https://github.com/facebook/react-native/issues/26314)

Differential Revision: D17224299

Pulled By: mdvacca

fbshipit-source-id: cbd1b3d5d686e284fdc8e3f6faaeaa93654b301d
---
 gradle/wrapper/gradle-wrapper.properties                  | 2 +-
 gradlew                                                   | 4 ++--
 template/android/gradle/wrapper/gradle-wrapper.properties | 2 +-
 template/android/gradlew                                  | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 8d58bda4472b70..ca9d62814a252e 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 8e25e6c19d5748..83f2acfdc319a2 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/template/android/gradle/wrapper/gradle-wrapper.properties b/template/android/gradle/wrapper/gradle-wrapper.properties
index 8d58bda4472b70..ca9d62814a252e 100644
--- a/template/android/gradle/wrapper/gradle-wrapper.properties
+++ b/template/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/template/android/gradlew b/template/android/gradlew
index 8e25e6c19d5748..83f2acfdc319a2 100755
--- a/template/android/gradlew
+++ b/template/android/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"`