kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-10-03 17:50:11 +02:00
Code Activity

Add support for gradle plugin version 0.12

Browse Source
This commit is contained in:
Daniel Martí 2014-07-04 08:50:20 +02:00
parent 8b469a79f8
commit 8595e216f4
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
buildserver/cookbooks/gradle/recipes/gradle
View File

@ -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

2
fdroidserver/build.py
View File

@ -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)