From: Daniel Martí <mvdan@mvdan.cc>
Date: Thu, 10 Jul 2014 10:07:10 +0000 (+0200)
Subject: Don't use the error-prone -x method to avoid lint usage
X-Git-Tag: 0.2.1~13
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=d69f93e5b21a30efe5c1069b01de6e1f0dddff1a;p=fdroidserver.git

Don't use the error-prone -x method to avoid lint usage
---

diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index 0136f379..9d7185b3 100644
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@ -696,8 +696,9 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
         commands += ['assemble' + flavours_cmd + 'Release']
 
         # Avoid having to use lintOptions.abortOnError false
-        if thisbuild['gradlepluginver'] >= LooseVersion('0.8'):
-            commands += ['-x', 'lintVital' + flavours_cmd + 'Release']
+        if thisbuild['gradlepluginver'] >= LooseVersion('0.7'):
+            with open(os.path.join(root_dir, 'build.gradle'), "a") as f:
+                f.write("\nandroid { lintOptions { checkReleaseBuilds false } }\n")
 
         p = FDroidPopen(commands, cwd=root_dir)