Small gradle wrapper fix

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

diff --git a/buildserver/cookbooks/gradle/recipes/gradle b/buildserver/cookbooks/gradle/recipes/gradle
index cd06c2bdd1856e91338aee2ca9cb76c9ce8a2016..2bcb0415115ef9addc1fd01ffc22c9ce610b2a31 100755 (executable)
--- a/buildserver/cookbooks/gradle/recipes/gradle
+++ b/buildserver/cookbooks/gradle/recipes/gradle
@@ -30,7 +30,7 @@ d_plugin_v=(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
 plugin_v=(2.9 2.8 2.7 2.6 2.5 2.4 2.3 2.2.1 2.1 1.12 1.11 1.10 1.9 1.8 1.7 1.6 1.4)
 
 # Find the highest version available
-for v in ${plugin_v}; do
+for v in ${plugin_v[*]}; do
        if contains $v "${v_all[*]}"; then
                v_def=$v
                break
@@ -43,7 +43,7 @@ for f in build.gradle ../build.gradle; do
        while read l; do
                if [[ -z "$plugin_pver" && $l == *'com.android.tools.build:gradle:'* ]]; then
                        plugin_pver=$(echo -n "$l" | sed "s/.*com.android.tools.build:gradle:\\([0-9\\.\\+]\\+\\).*/\\1/")
-               elif [[ -z "$wrapper_ver" && $l == *'gradleVersion'* ]]; then
+               elif [[ -z "$wrapper_ver" && $l == *'gradleVersion = '* ]]; then
                        wrapper_ver=$(echo -n "$l" | sed "s/.*gradleVersion *=* *[\"']\\([0-9\\.]\\+\\)[\"'].*/\\1/")
                fi
        done < $f