From 56620177aa8305242a0b5d86fc21ddcdac38cec2 Mon Sep 17 00:00:00 2001 From: relan Date: Wed, 16 Jan 2019 07:20:07 +0300 Subject: [PATCH] makebuildserver: add Gradle 5.1 and 5.1.1 --- gradlew-fdroid | 4 +++- makebuildserver | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/gradlew-fdroid b/gradlew-fdroid index 0a4cf2c7..69dc03e9 100755 --- a/gradlew-fdroid +++ b/gradlew-fdroid @@ -112,6 +112,8 @@ get_sha() { ["4.10.2"]="b49c6da1b2cb67a0caf6c7480630b51c70a11ca2016ff2f555eaeda863143a29" \ ["4.10.3"]="8626cbf206b4e201ade7b87779090690447054bc93f052954c78480fa6ed186e" \ ["5.0"]="6157ac9f3410bc63644625b3b3e9e96c963afd7910ae0697792db57813ee79a6" \ + ["5.1"]="7506638a380092a0406364c79d6c87d03d23017fc25a5770379d1ce23c3fcd4d" \ + ["5.1.1"]="4953323605c5d7b89e97d0dc7779e275bccedefcdac090aec123375eae0cc798" \ ) [ ! ${gradle_hashes[$1]+abc} ] && exit 1 echo "${gradle_hashes["$1"]}" @@ -133,7 +135,7 @@ 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 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=(5.0 4.10.3 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.1.1 5.1 5.0 4.10.3 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 8c42c0a9..4a1f932c 100755 --- a/makebuildserver +++ b/makebuildserver @@ -351,6 +351,10 @@ cachefiles = [ '8626cbf206b4e201ade7b87779090690447054bc93f052954c78480fa6ed186e'), ('https://downloads.gradle.org/distributions/gradle-5.0-bin.zip', '6157ac9f3410bc63644625b3b3e9e96c963afd7910ae0697792db57813ee79a6'), + ('https://downloads.gradle.org/distributions/gradle-5.1-bin.zip', + '7506638a380092a0406364c79d6c87d03d23017fc25a5770379d1ce23c3fcd4d'), + ('https://downloads.gradle.org/distributions/gradle-5.1.1-bin.zip', + '4953323605c5d7b89e97d0dc7779e275bccedefcdac090aec123375eae0cc798'), ('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',