Merge branch 'add-gradle-5.6.1' into 'master'

Add Gradle 5.6.1 and 5.6.2

See merge request fdroid/fdroidserver!673
This commit is contained in:
Hans-Christoph Steiner 2019-09-09 11:04:11 +00:00
commit c70e2ff056
2 changed files with 6 additions and 4 deletions

View File

@ -123,6 +123,8 @@ get_sha() {
["5.5"]="8d78b2ed63e7f07ad169c1186d119761c4773e681f332cfe1901045b1b0141bc" \
["5.5.1"]="222a03fcf2fcaf3691767ce9549f78ebd4a77e73f9e23a396899fb70b420cd00" \
["5.6"]="15c02ef5dd3631ec02ac52e8725703e0285d9a7eecbf4e5939aa9e924604d01d" \
["5.6.1"]="0986244820e4a35d32d91df2ec4b768b5ba5d6c8246753794f85159f9963ec12" \
["5.6.2"]="32fce6628848f799b0ad3205ae8db67d0d828c10ffe62b748a7c0d9f4a5d9ee0" \
)
[ ! ${gradle_hashes[$1]+abc} ] && exit 1
echo "${gradle_hashes["$1"]}"
@ -144,7 +146,7 @@ d_plugin_k=(3.3 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
d_plugin_v=(4.10.1 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.6 5.5.1 5.5 5.4.1 5.4 5.3.1 5.3 5.2.1 5.2 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)
plugin_v=(5.6.2 5.6.1 5.6 5.5.1 5.5 5.4.1 5.4 5.3.1 5.3 5.2.1 5.2 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[@]}

View File

@ -344,7 +344,7 @@ CACHE_FILES = [
'b49c6da1b2cb67a0caf6c7480630b51c70a11ca2016ff2f555eaeda863143a29'),
('https://downloads.gradle.org/distributions/gradle-4.10.3-bin.zip',
'8626cbf206b4e201ade7b87779090690447054bc93f052954c78480fa6ed186e'),
# Only add the latest point released of gradle to the default install.
# Only add the latest point release of gradle to the default install.
# Other versions will be downloaded on demand.
('https://downloads.gradle.org/distributions/gradle-5.0-bin.zip',
'6157ac9f3410bc63644625b3b3e9e96c963afd7910ae0697792db57813ee79a6'),
@ -358,8 +358,8 @@ CACHE_FILES = [
'7bdbad1e4f54f13c8a78abc00c26d44dd8709d4aedb704d913fb1bb78ac025dc'),
('https://services.gradle.org/distributions/gradle-5.5.1-bin.zip',
'222a03fcf2fcaf3691767ce9549f78ebd4a77e73f9e23a396899fb70b420cd00'),
('https://services.gradle.org/distributions/gradle-5.6-bin.zip',
'15c02ef5dd3631ec02ac52e8725703e0285d9a7eecbf4e5939aa9e924604d01d'),
('https://services.gradle.org/distributions/gradle-5.6.2-bin.zip',
'32fce6628848f799b0ad3205ae8db67d0d828c10ffe62b748a7c0d9f4a5d9ee0'),
('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',