From 2a2613520a449a4798e209fbc9db6d47af65033c Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Tue, 27 Nov 2018 16:29:44 +0100 Subject: [PATCH 1/2] provision-gradle: skip versions older than 2.2.1 These are almost never used now and still can be downloaded on-demand. --- buildserver/provision-gradle | 9 ++++++++- makebuildserver | 22 ---------------------- 2 files changed, 8 insertions(+), 23 deletions(-) diff --git a/buildserver/provision-gradle b/buildserver/provision-gradle index e385fffe..d0eaf8ea 100644 --- a/buildserver/provision-gradle +++ b/buildserver/provision-gradle @@ -2,11 +2,18 @@ set -ex + +# version compare magic +vergte() { + printf '%s\n%s' "$1" "$2" | sort -C -V -r +} + test -e /opt/gradle/versions || mkdir -p /opt/gradle/versions cd /opt/gradle/versions for f in /vagrant/cache/gradle-*.zip; do ver=`echo $f | sed 's,.*gradle-\([0-9][0-9.]*\).*\.zip,\1,'` - if [ ! -d /opt/gradle/versions/${ver} ]; then + # only use versions greater or equal 2.2.1 + if vergte $ver 2.2.1 && [ ! -d /opt/gradle/versions/${ver} ]; then unzip -qq $f mv gradle-${ver} /opt/gradle/versions/${ver} fi diff --git a/makebuildserver b/makebuildserver index e7d82111..7ee2ac57 100755 --- a/makebuildserver +++ b/makebuildserver @@ -299,28 +299,6 @@ cachefiles = [ '4825b52a6258a9c2ab073720a5e91e2fa81b552b48024ee81887b863397416af'), ('https://dl.google.com/android/repository/build-tools_r28.0.2-linux.zip', '12cebcafd8f30119c7ef53ffb3562a5b5b9f776c9399038587c18df44ea6452b'), - # the binaries that Google uses are here: - # https://android.googlesource.com/platform/tools/external/gradle/+/studio-1.5/ - ('https://services.gradle.org/distributions/gradle-1.4-bin.zip', - 'cd99e85fbcd0ae8b99e81c9992a2f10cceb7b5f009c3720ef3a0078f4f92e94e'), - ('https://services.gradle.org/distributions/gradle-1.6-bin.zip', - 'de3e89d2113923dcc2e0def62d69be0947ceac910abd38b75ec333230183fac4'), - ('https://services.gradle.org/distributions/gradle-1.7-bin.zip', - '360c97d51621b5a1ecf66748c718594e5f790ae4fbc1499543e0c006033c9d30'), - ('https://services.gradle.org/distributions/gradle-1.8-bin.zip', - 'a342bbfa15fd18e2482287da4959588f45a41b60910970a16e6d97959aea5703'), - ('https://services.gradle.org/distributions/gradle-1.9-bin.zip', - '097ddc2bcbc9da2bb08cbf6bf8079585e35ad088bafd42e8716bc96405db98e9'), - ('https://services.gradle.org/distributions/gradle-1.10-bin.zip', - '6e6db4fc595f27ceda059d23693b6f6848583950606112b37dfd0e97a0a0a4fe'), - ('https://services.gradle.org/distributions/gradle-1.11-bin.zip', - '07e235df824964f0e19e73ea2327ce345c44bcd06d44a0123d29ab287fc34091'), - ('https://services.gradle.org/distributions/gradle-1.12-bin.zip', - '8734b13a401f4311ee418173ed6ca8662d2b0a535be8ff2a43ecb1c13cd406ea'), - ('https://services.gradle.org/distributions/gradle-2.1-bin.zip', - '3eee4f9ea2ab0221b89f8e4747a96d4554d00ae46d8d633f11cfda60988bf878'), - ('https://services.gradle.org/distributions/gradle-2.2-bin.zip', - '91e5655fe11ef414449f218c4fa2985b3a49b7903c57556da109c84fa26e1dfb'), ('https://services.gradle.org/distributions/gradle-2.2.1-bin.zip', '420aa50738299327b611c10b8304b749e8d3a579407ee9e755b15921d95ff418'), ('https://services.gradle.org/distributions/gradle-2.3-bin.zip', From 8ac171ba1a80a12252bf1e96d9f432080b72608c Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Tue, 27 Nov 2018 16:30:29 +0100 Subject: [PATCH 2/2] add gradle 5.0 closes #594 --- gradlew-fdroid | 7 ++++--- makebuildserver | 2 ++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/gradlew-fdroid b/gradlew-fdroid index 87e71639..d0b39421 100755 --- a/gradlew-fdroid +++ b/gradlew-fdroid @@ -110,6 +110,7 @@ get_sha() { ["4.10"]="248cfd92104ce12c5431ddb8309cf713fe58de8e330c63176543320022f59f18" \ ["4.10.1"]="e53ce3a01cf016b5d294eef20977ad4e3c13e761ac1e475f1ffad4c6141a92bd" \ ["4.10.2"]="b49c6da1b2cb67a0caf6c7480630b51c70a11ca2016ff2f555eaeda863143a29" \ + ["5.0"]="6157ac9f3410bc63644625b3b3e9e96c963afd7910ae0697792db57813ee79a6" \ ) [ ! ${gradle_hashes[$1]+abc} ] && exit 1 echo "${gradle_hashes["$1"]}" @@ -127,11 +128,11 @@ contains() { # (key) should accept. plugin versions are actually prefixes and catch sub- # versions as well. Pairs are taken from: # https://developer.android.com/studio/releases/gradle-plugin.html#updating-gradle -d_plugin_k=(3.1 3.0 2.3 2.2 2.1.3 2.1 2.0 1.5 1.3 1.2 1.1 1.0 0.14 0.13 0.12 0.11 0.10 0.9 0.8 0.7 0.6 0.5 0.4 0.3 0.2) -d_plugin_v=(4.4 4.1 3.3 2.14.1 2.14.1 2.12 2.12 2.4 2.4 2.3 2.2.1 2.2.1 2.1 2.1 1.12 1.12 1.12 1.11 1.10 1.9 1.8 1.6 1.6 1.4 1.4) +d_plugin_k=(3.2 3.1 3.0 2.3 2.2 2.1.3 2.1 2.0 1.5 1.3 1.2 1.1 1.0 0.14 0.13 0.12 0.11 0.10 0.9 0.8 0.7 0.6 0.5 0.4 0.3 0.2) +d_plugin_v=(4.6 4.4 4.1 3.3 2.14.1 2.14.1 2.12 2.12 2.4 2.4 2.3 2.2.1 2.2.1 2.1 2.1 1.12 1.12 1.12 1.11 1.10 1.9 1.8 1.6 1.6 1.4 1.4) # All gradle versions we know about -plugin_v=(4.10.2 4.10.1 4.10 4.9 4.8.1 4.8 4.7 4.6 4.5.1 4.5 4.4.1 4.4 4.3.1 4.3 4.2.1 4.2 4.1 4.0.2 4.0.1 4.0 3.5.1 3.5 3.4.1 3.4 3.3 3.2.1 3.2 3.1 3.0 2.14.1 2.14 2.13 2.12 2.11 2.10 2.9 2.8 2.7 2.6 2.5 2.4 2.3 2.2.1 2.2 2.1 1.12 1.11 1.10 1.9 1.8 1.7 1.6 1.4) +plugin_v=(5.0 4.10.2 4.10.1 4.10 4.9 4.8.1 4.8 4.7 4.6 4.5.1 4.5 4.4.1 4.4 4.3.1 4.3 4.2.1 4.2 4.1 4.0.2 4.0.1 4.0 3.5.1 3.5 3.4.1 3.4 3.3 3.2.1 3.2 3.1 3.0 2.14.1 2.14 2.13 2.12 2.11 2.10 2.9 2.8 2.7 2.6 2.5 2.4 2.3 2.2.1 2.2 2.1 1.12 1.11 1.10 1.9 1.8 1.7 1.6 1.4) v_all=${plugin_v[@]} diff --git a/makebuildserver b/makebuildserver index 7ee2ac57..f408bb8d 100755 --- a/makebuildserver +++ b/makebuildserver @@ -385,6 +385,8 @@ cachefiles = [ 'e53ce3a01cf016b5d294eef20977ad4e3c13e761ac1e475f1ffad4c6141a92bd'), ('https://downloads.gradle.org/distributions/gradle-4.10.2-bin.zip', 'b49c6da1b2cb67a0caf6c7480630b51c70a11ca2016ff2f555eaeda863143a29'), + ('https://downloads.gradle.org/distributions/gradle-5.0-bin.zip', + '6157ac9f3410bc63644625b3b3e9e96c963afd7910ae0697792db57813ee79a6'), ('https://dl.google.com/android/ndk/android-ndk-r10e-linux-x86_64.bin', '102d6723f67ff1384330d12c45854315d6452d6510286f4e5891e00a5a8f1d5a'), ('https://dl.google.com/android/repository/android-ndk-r11c-linux-x86_64.zip',