From 2c2d9032778f4958d1ad2e83437637cab94ecb59 Mon Sep 17 00:00:00 2001 From: Rene Groeschke Date: Thu, 4 Jun 2020 11:01:11 +0200 Subject: [PATCH] Revert "Update Gradle wrapper to 6.5 (#57580)" This reverts commit b7e39dd1c8f0ee1a5a856a8f4b96c42ec8e6357a. --- buildSrc/src/main/resources/minimumGradleVersion | 2 +- distribution/bwc/build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/buildSrc/src/main/resources/minimumGradleVersion b/buildSrc/src/main/resources/minimumGradleVersion index 69c93913e47..306894a15ed 100644 --- a/buildSrc/src/main/resources/minimumGradleVersion +++ b/buildSrc/src/main/resources/minimumGradleVersion @@ -1 +1 @@ -6.5 \ No newline at end of file +6.4.1 \ No newline at end of file diff --git a/distribution/bwc/build.gradle b/distribution/bwc/build.gradle index 52ff834963f..ee00629dcaf 100644 --- a/distribution/bwc/build.gradle +++ b/distribution/bwc/build.gradle @@ -107,7 +107,7 @@ BuildParams.bwcVersions.forPreviousUnreleased { BwcVersions.UnreleasedVersionInf task checkoutBwcBranch() { dependsOn fetchLatest doLast { - def refspec = System.getProperty("bwc.refspec." + bwcBranch) ?: System.getProperty("tests.bwc.refspec." + bwcBranch) ?: "${remote}/${bwcBranch}" + String refspec = System.getProperty("bwc.refspec.${bwcBranch}") ?: System.getProperty("tests.bwc.refspec.${bwcBranch}") ?: "${remote}/${bwcBranch}" if (System.getProperty("bwc.checkout.align") != null) { /* We use a time based approach to make the bwc versions built deterministic and compatible with the current hash. diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 50a87ee0fe2..73ec92ad3af 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-6.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionSha256Sum=c9910513d0eed63cd8f5c7fec4cb4a05731144770104a0871234a4edc3ba3cef +distributionSha256Sum=3fd824892df8ad5847be6e4fb7d3600068437de172939fd657cc280a1a629f63