chiark / gitweb /
Small gradle wrapper fix
authorDaniel Martí <mvdan@mvdan.cc>
Thu, 24 Dec 2015 22:08:31 +0000 (23:08 +0100)
committerDaniel Martí <mvdan@mvdan.cc>
Thu, 24 Dec 2015 22:08:31 +0000 (23:08 +0100)
It broke on cases like:

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

buildserver/cookbooks/gradle/recipes/gradle

index 1ad3ac3c2e818bcf0fdab866f816790e5b73c067..2bcb0415115ef9addc1fd01ffc22c9ce610b2a31 100755 (executable)
@@ -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