From: Daniel Martí <mvdan@mvdan.cc>
Date: Thu, 24 Dec 2015 22:08:31 +0000 (+0100)
Subject: Small gradle wrapper fix
X-Git-Tag: 0.6.0~46
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=fdroidserver.git;a=commitdiff_plain;h=20ced3f303225ac6815c2b012438e18f876400a1

Small gradle wrapper fix

It broke on cases like:

	if (gradle.gradleVersion >= "2.2") {
---

diff --git a/buildserver/cookbooks/gradle/recipes/gradle b/buildserver/cookbooks/gradle/recipes/gradle
index 1ad3ac3c..2bcb0415 100755
--- a/buildserver/cookbooks/gradle/recipes/gradle
+++ b/buildserver/cookbooks/gradle/recipes/gradle
@@ -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