Add gradle 2.2.1 for plugin versions 1.0.X

[fdroidserver.git] / buildserver / cookbooks / gradle / recipes / gradle

diff --git a/buildserver/cookbooks/gradle/recipes/gradle b/buildserver/cookbooks/gradle/recipes/gradle
index b0ad02d860c7e1df1243deb2f8e62994cb9aa1c2..1cf040fccddf98078e01814df7f92bcc943c1a48 100755 (executable)
--- 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