Add support for gradle plugin version 0.12

diff --git a/buildserver/cookbooks/gradle/recipes/gradle b/buildserver/cookbooks/gradle/recipes/gradle
index 16af9ba07622568de579e301e2188934609223d2..89169b245af235339317eedbf0bfa401a37f8b0f 100755 (executable)
--- a/buildserver/cookbooks/gradle/recipes/gradle
+++ b/buildserver/cookbooks/gradle/recipes/gradle
@@ -23,8 +23,8 @@ contains() {
 
 # key-value pairs of what gradle version each gradle plugin version
 # should accept
-d_plugin_k=(0.11 0.10  0.9  0.8 0.7 0.6 0.5 0.4 0.3 0.2)
-d_plugin_v=(1.12 1.12 1.11 1.10 1.9 1.8 1.6 1.6 1.4 1.4)
+d_plugin_k=(0.12 0.11 0.10  0.9  0.8 0.7 0.6 0.5 0.4 0.3 0.2)
+d_plugin_v=(1.12 1.12 1.12 1.11 1.10 1.9 1.8 1.6 1.6 1.4 1.4)
 
 for v in ${d_plugin_v}; do
        contains $v "${v_all[*]}" && v_def=$v && break

diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index 664177a54b4190fc6b06f358e0a0f106ffc33935..e66ea710fb24e3e12e78e1c84398a24633dfe46e 100644 (file)
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@ -696,7 +696,7 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
 
         # Avoid having to use lintOptions.abortOnError false
         # TODO: Do flavours or project names change this task name?
-        if LooseVersion('0.8') <= thisbuild['gradlepluginver'] < LooseVersion('0.11'):
+        if LooseVersion('0.8') <= thisbuild['gradlepluginver'] < LooseVersion('0.12'):
             commands += ['-x', 'lintVital' + flavours_cmd + 'Release']
 
         p = FDroidPopen(commands, cwd=root_dir)