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 a5fe1cb94b9..91ca28c8b80 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/.gradle-wrapper/gradle-wrapper.jar differ
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
index 7962563f742..fdbd3758709 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/.gradle-wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-all.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-zipStorePath=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 c538c0cb898..e8012f03693 100644
--- a/build.gradle
+++ b/build.gradle
@@ -440,25 +440,18 @@ 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 = 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)
+    final String existingProperties = getPropertiesFile().getText('UTF-8')
+    getPropertiesFile().setText("${existingProperties}distributionSha256Sum=${sha256Sum}\n", 'UTF-8')
   }
-
 }
 
 static void assertLinesInFile(final Path path, final List<String> expectedLines) {
diff --git a/gradlew b/gradlew
index cccdd3d517f..1c1e5df9de9 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 e95643d6a2c..ec246509418 100644
Binary files a/gradlew.bat and b/gradlew.bat differ