From: Daniel Martí Date: Sat, 15 Nov 2014 20:38:48 +0000 (+0100) Subject: Fix issue where the wrong gradle version may be used X-Git-Tag: 0.3.0~22 X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=bf20d5af88e81fdb051236d3f6568dbe81772eda;p=fdroidserver.git Fix issue where the wrong gradle version may be used --- diff --git a/buildserver/cookbooks/gradle/recipes/gradle b/buildserver/cookbooks/gradle/recipes/gradle index f8a38192..b0ad02d8 100755 --- a/buildserver/cookbooks/gradle/recipes/gradle +++ b/buildserver/cookbooks/gradle/recipes/gradle @@ -33,8 +33,8 @@ for v in ${d_plugin_v}; do fi done -# Latest takes priority -for f in ../build.gradle build.gradle; do +# Earliest takes priority +for f in build.gradle ../build.gradle; do [[ -f $f ]] || continue while read l; do if [[ -z "$plugin_pver" && $l == *'com.android.tools.build:gradle:'* ]]; then