From c56c8a3e0f80c516696ebc9ad72e361f08d4feab Mon Sep 17 00:00:00 2001
From: Ryan Ernst <ryan@iernst.net>
Date: Wed, 25 Apr 2018 11:06:33 -0700
Subject: [PATCH 1/3] Build: Move gradle wrapper jar to a dot dir

This commit moves the gradle wrapper jar file to a hidden directory, so
that it does not clutter the top level names seen when doing an ls in
the project. The actual jar file is never manually edited, and only
changed by running `./gradlew wrapper ...` so it is not important for
this directory to be "visible".
---
 .../gradle-wrapper.jar                        | Bin 54329 -> 54413 bytes
 .../gradle-wrapper.properties                 |   0
 build.gradle                                  |  28 +++++++-----------
 gradlew                                       |   2 +-
 gradlew.bat                                   |   2 +-
 5 files changed, 12 insertions(+), 20 deletions(-)
 rename {gradle/wrapper => .gradle-wrapper}/gradle-wrapper.jar (81%)
 rename {gradle/wrapper => .gradle-wrapper}/gradle-wrapper.properties (100%)

diff --git a/gradle/wrapper/gradle-wrapper.jar b/.gradle-wrapper/gradle-wrapper.jar
similarity index 81%
rename from gradle/wrapper/gradle-wrapper.jar
rename to .gradle-wrapper/gradle-wrapper.jar
index a5fe1cb94b9ee5ce57e6113458225bcba12d83e3..91ca28c8b802289c3a438766657a5e98f20eff03 100644
GIT binary patch
delta 7397
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

delta 7284
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
G$NV3Vs|}d|

diff --git a/gradle/wrapper/gradle-wrapper.properties b/.gradle-wrapper/gradle-wrapper.properties
similarity index 100%
rename from gradle/wrapper/gradle-wrapper.properties
rename to .gradle-wrapper/gradle-wrapper.properties
diff --git a/build.gradle b/build.gradle
index 0c61eecd85c09..2b7e2739567c2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -438,25 +438,17 @@ task run(type: Run) {
   impliesSubProjects = true
 }
 
-task wrapper(type: Wrapper)
-
-gradle.projectsEvaluated {
-
-  allprojects {
-    tasks.withType(Wrapper) { Wrapper wrapper ->
-      wrapper.distributionType = DistributionType.ALL
-
-      wrapper.doLast {
-        final DistributionLocator locator = new DistributionLocator()
-        final GradleVersion version = GradleVersion.version(wrapper.gradleVersion)
-        final URI distributionUri = locator.getDistributionFor(version, wrapper.distributionType.name().toLowerCase(Locale.ENGLISH))
-        final URI sha256Uri = new URI(distributionUri.toString() + ".sha256")
-        final String sha256Sum = new String(sha256Uri.toURL().bytes)
-        wrapper.getPropertiesFile() << "distributionSha256Sum=${sha256Sum}\n"
-      }
-    }
+task wrapper(type: Wrapper) {
+  distributionType = DistributionType.ALL
+  jarFile = "${project.projectDir}/.gradle-wrapper/gradle-wrapper.jar"
+  doLast {
+    final DistributionLocator locator = new DistributionLocator()
+    final GradleVersion version = GradleVersion.version(gradleVersion)
+    final URI distributionUri = locator.getDistributionFor(version, distributionType.name().toLowerCase(Locale.ENGLISH))
+    final URI sha256Uri = new URI(distributionUri.toString() + ".sha256")
+    final String sha256Sum = new String(sha256Uri.toURL().bytes)
+    getPropertiesFile().setText("distributionSha256Sum=${sha256Sum}\n", 'UTF-8')
   }
-
 }
 
 /* Remove assemble on all qa projects because we don't need to publish
diff --git a/gradlew b/gradlew
index cccdd3d517fc5..1c1e5df9de9e1 100755
--- a/gradlew
+++ b/gradlew
@@ -64,7 +64,7 @@ case "`uname`" in
     ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH=$APP_HOME/.gradle-wrapper/gradle-wrapper.jar
 
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
diff --git a/gradlew.bat b/gradlew.bat
index e95643d6a2ca6..ec24650941835 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -63,7 +63,7 @@ set CMD_LINE_ARGS=%*
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=%APP_HOME%\.gradle-wrapper\gradle-wrapper.jar
 
 @rem Execute Gradle
 "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%

From 460676c57a59c70cb7567138b0dfb5ade2c5b8db Mon Sep 17 00:00:00 2001
From: Ryan Ernst <ryan@iernst.net>
Date: Wed, 25 Apr 2018 14:50:33 -0700
Subject: [PATCH 2/3] regen once more

---
 .gradle-wrapper/gradle-wrapper.properties | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.gradle-wrapper/gradle-wrapper.properties b/.gradle-wrapper/gradle-wrapper.properties
index 7962563f742fe..4f5702da8f926 100644
--- a/.gradle-wrapper/gradle-wrapper.properties
+++ b/.gradle-wrapper/gradle-wrapper.properties
@@ -1,6 +1 @@
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-all.zip
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 distributionSha256Sum=203f4537da8b8075e38c036a6d14cb71b1149de5bf0a8f6db32ac2833a1d1294

From 20cc20883cf495b688ea193960040e0fefd77519 Mon Sep 17 00:00:00 2001
From: Ryan Ernst <ryan@iernst.net>
Date: Wed, 25 Apr 2018 14:57:26 -0700
Subject: [PATCH 3/3] fix concat

---
 .gradle-wrapper/gradle-wrapper.properties | 5 +++++
 build.gradle                              | 5 +++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/.gradle-wrapper/gradle-wrapper.properties b/.gradle-wrapper/gradle-wrapper.properties
index 4f5702da8f926..fdbd3758709dc 100644
--- a/.gradle-wrapper/gradle-wrapper.properties
+++ b/.gradle-wrapper/gradle-wrapper.properties
@@ -1 +1,6 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-all.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
 distributionSha256Sum=203f4537da8b8075e38c036a6d14cb71b1149de5bf0a8f6db32ac2833a1d1294
diff --git a/build.gradle b/build.gradle
index 2b7e2739567c2..eb9afb354d319 100644
--- a/build.gradle
+++ b/build.gradle
@@ -440,14 +440,15 @@ task run(type: Run) {
 
 task wrapper(type: Wrapper) {
   distributionType = DistributionType.ALL
-  jarFile = "${project.projectDir}/.gradle-wrapper/gradle-wrapper.jar"
+  jarFile = file('.gradle-wrapper/gradle-wrapper.jar')
   doLast {
     final DistributionLocator locator = new DistributionLocator()
     final GradleVersion version = GradleVersion.version(gradleVersion)
     final URI distributionUri = locator.getDistributionFor(version, distributionType.name().toLowerCase(Locale.ENGLISH))
     final URI sha256Uri = new URI(distributionUri.toString() + ".sha256")
     final String sha256Sum = new String(sha256Uri.toURL().bytes)
-    getPropertiesFile().setText("distributionSha256Sum=${sha256Sum}\n", 'UTF-8')
+    final String existingProperties = getPropertiesFile().getText('UTF-8')
+    getPropertiesFile().setText("${existingProperties}distributionSha256Sum=${sha256Sum}\n", 'UTF-8')
   }
 }