From: Daniel Martí <mvdan@mvdan.cc>
Date: Fri, 10 Oct 2014 10:53:44 +0000 (+0200)
Subject: Fix gradle 2.1
X-Git-Tag: 0.3.0~45
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=ea62609a80598d70b2aed997b3bf5dabe797ff42;p=fdroidserver.git

Fix gradle 2.1
---

diff --git a/buildserver/cookbooks/gradle/recipes/default.rb b/buildserver/cookbooks/gradle/recipes/default.rb
index 06055e24..792813d4 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}.each do |ver|
+%w{1.4 1.6 1.7 1.8 1.9 1.10 1.11 1.12 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 7562ad0c..cbb7cbed 100755
--- a/buildserver/cookbooks/gradle/recipes/gradle
+++ b/buildserver/cookbooks/gradle/recipes/gradle
@@ -27,7 +27,10 @@ d_plugin_k=(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 1.12 1.12 1.12 1.11 1.10 1.9 1.8 1.6 1.6 1.4 1.4)
 
 for v in ${d_plugin_v}; do
-	contains $v "${v_all[*]}" && v_def=$v && break
+	if contains $v "${v_all[*]}"; then
+		v_def=$v
+		break
+	fi
 done
 
 # Latest takes priority