From: Daniel Martí <mvdan@mvdan.cc>
Date: Thu, 24 Dec 2015 15:40:36 +0000 (+0100)
Subject: gradle: Never add lintOptions workaround
X-Git-Tag: 0.6.0~48
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=138618937f98a0f42f3f1e0df7f19aa3f20fee5c;p=fdroidserver.git

gradle: Never add lintOptions workaround

This breaks on newer plugin versions. Instead of complicating this logic
even further to support them, upstream devs should instead use gradle
configs that actually work.

If their build fails because of lint, it's theirs to fix, not ours.
---

diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index 44d48bba..d792132d 100644
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@ -736,11 +736,6 @@ def build_local(app, build, vcs, build_dir, output_dir, srclib_dir, extlib_dir,
     elif method == 'gradle':
         logging.info("Building Gradle project...")
 
-        # Avoid having to use lintOptions.abortOnError false
-        if build.gradlepluginver >= LooseVersion('0.7'):
-            with open(os.path.join(root_dir, 'build.gradle'), "a") as f:
-                f.write("\nandroid { lintOptions { checkReleaseBuilds false } }\n")
-
         cmd = [config['gradle']]
         if build.gradleprops:
             cmd += ['-P'+kv for kv in build.gradleprops]