gradle: support gradle-wrapper.properties version

Brings our wrapper closer to gradlew's functionality.

Updates #98.

diff --git a/buildserver/gradle b/buildserver/gradle
index ea7b7006da762de20d8a42f7818fb39f3bd10e21..0ab39784386d4cbc93ee2b9588bb5e014ad14a39 100755 (executable)
--- a/buildserver/gradle
+++ b/buildserver/gradle
@@ -30,7 +30,23 @@ v_all=${plugin_v[@]}
 echo "Available gradle versions: ${v_all[@]}"
 
 # Earliest takes priority
-for f in build.gradle ../build.gradle; do
+for f in {.,..}/gradle/wrapper/gradle-wrapper.properties; do
+       [[ -f $f ]] || continue
+       while read l; do
+               if [[ $l == 'distributionUrl='* ]]; then
+                       wrapper_ver=$(echo -n "$l" | sed "s/.*gradle-\\([0-9\\.\\+]\\+\\).*/\\1/")
+               fi
+       done < $f
+done
+
+if [[ -n $wrapper_ver ]]; then
+       v_found=$wrapper_ver
+       echo "Found $v_found via distributionUrl"
+       run_gradle
+fi
+
+# Earliest takes priority
+for f in {.,..}/build.gradle; do
        [[ -f $f ]] || continue
        while read l; do
                if [[ -z "$plugin_pver" && $l == *'com.android.tools.build:gradle:'* ]]; then