Skip to content

Commit

Permalink
Bug 1509572 - Part 1: Bump Gradle wrapper to 4.10.2; decouple script …
Browse files Browse the repository at this point in the history
…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
  • Loading branch information
ncalexan committed Nov 26, 2018
1 parent 8a1e241 commit 1e4af0d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
7 changes: 3 additions & 4 deletions taskcluster/scripts/misc/android-gradle-dependencies/after.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ set -x -e
echo "running as" $(id)

: WORKSPACE ${WORKSPACE:=/builds/worker/workspace}
: GRADLE_VERSION ${GRADLE_VERSION:=4.4}

set -v

Expand All @@ -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

Expand Down

0 comments on commit 1e4af0d

Please sign in to comment.