From: Marcus <bubu@bubu1.eu>
Date: Fri, 15 Dec 2017 11:55:13 +0000 (+0000)
Subject: Merge branch 'gradle-4.4' into 'master'
X-Git-Tag: 1.0.0~27
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=a6928571a56dc1f41f87640efb39140bfc12cec7;hp=985e6189eb5dda9a60cb14e0d0c47dbce2b2d10d;p=fdroidserver.git

Merge branch 'gradle-4.4' into 'master'

makebuildserver: add Gradle 4.4

See merge request fdroid/fdroidserver!412
---

diff --git a/buildserver/gradle b/buildserver/gradle
index b43856e3..ab92b94a 100755
--- a/buildserver/gradle
+++ b/buildserver/gradle
@@ -26,7 +26,7 @@ d_plugin_k=(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.
 d_plugin_v=(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.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=(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[@]}
 echo "Available gradle versions: ${v_all[@]}"
diff --git a/makebuildserver b/makebuildserver
index f2faa09c..1eff57f2 100755
--- a/makebuildserver
+++ b/makebuildserver
@@ -336,6 +336,8 @@ cachefiles = [
      '8dcbf44eef92575b475dcb1ce12b5f19d38dc79e84c662670248dc8b8247654c'),
     ('https://downloads.gradle.org/distributions/gradle-4.3.1-bin.zip',
      '15ebe098ce0392a2d06d252bff24143cc88c4e963346582c8d88814758d93ac7'),
+    ('https://downloads.gradle.org/distributions/gradle-4.4-bin.zip',
+     'fa4873ae2c7f5e8c02ec6948ba95848cedced6134772a0169718eadcb39e0a2f'),
     ('https://dl.google.com/android/ndk/android-ndk-r10e-linux-x86_64.bin',
      '102d6723f67ff1384330d12c45854315d6452d6510286f4e5891e00a5a8f1d5a'),
     ('https://dl.google.com/android/ndk/android-ndk-r9b-linux-x86_64.tar.bz2',