From 1e4af0de3c823206001ad518c2f23d79a33382a6 Mon Sep 17 00:00:00 2001 From: Nick Alexander Date: Mon, 26 Nov 2018 21:42:27 +0000 Subject: [PATCH] Bug 1509572 - Part 1: Bump Gradle wrapper to 4.10.2; decouple script from Gradle version. r=snorp This depends on there being only one Gradle version downloaded, but I think that is safe enough. Differential Revision: https://phabricator.services.mozilla.com/D12790 --HG-- extra : moz-landing-system : lando --- gradle/wrapper/gradle-wrapper.properties | 4 ++-- .../scripts/misc/android-gradle-dependencies/after.sh | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b0be10d4c455c..95ce2a3a5a44a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,5 +3,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip -distributionSha256Sum=7a2c66d1a78f811d5f37d14630ad21cec5e77a2a4dc61e787e2257a6341016ce +distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip +distributionSha256Sum=b7aedd369a26b177147bcb715f8b1fc4fe32b0a6ade0d7fd8ee5ed0c6f731f2c diff --git a/taskcluster/scripts/misc/android-gradle-dependencies/after.sh b/taskcluster/scripts/misc/android-gradle-dependencies/after.sh index d6e0ed3d091c0..cf6f45ca22c42 100755 --- a/taskcluster/scripts/misc/android-gradle-dependencies/after.sh +++ b/taskcluster/scripts/misc/android-gradle-dependencies/after.sh @@ -5,7 +5,6 @@ set -x -e echo "running as" $(id) : WORKSPACE ${WORKSPACE:=/builds/worker/workspace} -: GRADLE_VERSION ${GRADLE_VERSION:=4.4} set -v @@ -22,9 +21,9 @@ cp -R ${NEXUS_WORK}/storage/gradle-plugins android-gradle-dependencies # ~/.gradle/wrapper/dists/gradle-2.7-all/$PROJECT_HASH/gradle-2.7-all.zip. We # want to remove the version from the internal directory for use via tooltool in # a mozconfig. -cp ${GRADLE_USER_HOME}/wrapper/dists/gradle-${GRADLE_VERSION}-all/*/gradle-${GRADLE_VERSION}-all.zip gradle-${GRADLE_VERSION}-all.zip -unzip -q gradle-${GRADLE_VERSION}-all.zip -mv gradle-${GRADLE_VERSION} android-gradle-dependencies/gradle-dist +cp ${GRADLE_USER_HOME}/wrapper/dists/gradle-*-*/*/gradle-*-*.zip gradle.zip +unzip -q gradle.zip +mv gradle-* android-gradle-dependencies/gradle-dist tar cf - android-gradle-dependencies | xz > /builds/worker/artifacts/android-gradle-dependencies.tar.xz