From: Daniel Martí <mvdan@mvdan.cc>
Date: Fri, 12 Dec 2014 11:29:16 +0000 (+0100)
Subject: Add gradle 2.2.1 for plugin versions 1.0.X
X-Git-Tag: 0.3.0~18
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=05a7a872b6f89ac8537785ac43f05b82cbcf1933;p=fdroidserver.git

Add gradle 2.2.1 for plugin versions 1.0.X
---

diff --git a/buildserver/cookbooks/gradle/recipes/default.rb b/buildserver/cookbooks/gradle/recipes/default.rb
index 792813d4..247502d6 100644
--- a/buildserver/cookbooks/gradle/recipes/default.rb
+++ b/buildserver/cookbooks/gradle/recipes/default.rb
@@ -18,7 +18,7 @@ script "add-gradle-verdir" do
   not_if "test -d /opt/gradle/versions"
 end
 
-%w{1.4 1.6 1.7 1.8 1.9 1.10 1.11 1.12 2.1}.each do |ver|
+%w{1.4 1.6 1.7 1.8 1.9 1.10 1.11 1.12 2.1 2.2.1}.each do |ver|
   script "install-gradle-#{ver}" do
     cwd "/tmp"
     interpreter "bash"
diff --git a/buildserver/cookbooks/gradle/recipes/gradle b/buildserver/cookbooks/gradle/recipes/gradle
index b0ad02d8..1cf040fc 100755
--- a/buildserver/cookbooks/gradle/recipes/gradle
+++ b/buildserver/cookbooks/gradle/recipes/gradle
@@ -5,11 +5,11 @@ basedir="$(dirname $bindir)"
 verdir="${basedir}/versions"
 args=("$@")
 
-v_all=($(cd ${verdir} && ls | sort -rV))
+v_all=($(cd "${verdir}" && ls | sort -rV))
 echo "Available gradle versions: ${v_all[@]}"
 
 run_gradle() {
-	${verdir}/${v_found}/bin/gradle "${args[@]}"
+	"${verdir}/${v_found}/bin/gradle" "${args[@]}"
 	exit $?
 }
 
@@ -23,9 +23,10 @@ contains() {
 
 # key-value pairs of what gradle version each gradle plugin version
 # should accept
-d_plugin_k=(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=( 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=(  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=(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)
 
+# Find the highest version available
 for v in ${d_plugin_v}; do
 	if contains $v "${v_all[*]}"; then
 		v_def=$v
diff --git a/makebuildserver b/makebuildserver
index 2f67f345..7ebd0d4c 100755
--- a/makebuildserver
+++ b/makebuildserver
@@ -92,6 +92,9 @@ cachefiles = [
     ('gradle-2.1-bin.zip',
      'https://services.gradle.org/distributions/gradle-2.1-bin.zip',
      '3eee4f9ea2ab0221b89f8e4747a96d4554d00ae46d8d633f11cfda60988bf878'),
+    ('gradle-2.2.1-bin.zip',
+     'https://services.gradle.org/distributions/gradle-2.2.1-bin.zip',
+     '420aa50738299327b611c10b8304b749e8d3a579407ee9e755b15921d95ff418'),
     ('Kivy-1.7.2.tar.gz',
      'https://pypi.python.org/packages/source/K/Kivy/Kivy-1.7.2.tar.gz',
      '0485e2ef97b5086df886eb01f8303cb542183d2d71a159466f99ad6c8a1d03f1'),