From 8595e216f42e745a89e27aced952a090d84bcfb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Fri, 4 Jul 2014 08:50:20 +0200 Subject: [PATCH] Add support for gradle plugin version 0.12 --- buildserver/cookbooks/gradle/recipes/gradle | 4 ++-- fdroidserver/build.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/buildserver/cookbooks/gradle/recipes/gradle b/buildserver/cookbooks/gradle/recipes/gradle index 16af9ba0..89169b24 100755 --- 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 664177a5..e66ea710 100644 --- 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)