gradle: stop trying to patch outputFile

This often breaks since we're just removing a single line. Instead, use
a much more reliable way of finding output apks.

diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index 19df721568a113c969d0ead27b5d22bc157717ba..7ad765b472431ae9b346abceaae30d3c09cab95a 100644 (file)
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@ -789,13 +789,16 @@ def build_local(app, build, vcs, build_dir, output_dir, srclib_dir, extlib_dir,
                 os.path.join(root_dir, 'build', 'outputs', 'apk'),
                 os.path.join(root_dir, 'build', 'apk'),
                 ]:
-            apks = glob.glob(os.path.join(apks_dir, '*-release-unsigned.apk'))
-
-            if len(apks) > 1:
-                raise BuildException('More than one resulting apks found in %s' % apks_dir,
-                                     '\n'.join(apks))
-            if len(apks) == 1:
-                src = apks[0]
+            for apkglob in ['*-release-unsigned.apk', '*-unsigned.apk', '*.apk']:
+                apks = glob.glob(os.path.join(apks_dir, apkglob))
+
+                if len(apks) > 1:
+                    raise BuildException('More than one resulting apks found in %s' % apks_dir,
+                                         '\n'.join(apks))
+                if len(apks) == 1:
+                    src = apks[0]
+                    break
+            if src is not None:
                 break
 
         if src is None:

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 7666a1adf41225c9783f70e5c2c4acf7d122a769..60d1a7c76f3ddacdb09beb2b603f889955c1fbdc 100644 (file)
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -1636,8 +1636,6 @@ gradle_signing_configs = re.compile(r'^[\t ]*signingConfigs[ \t]*{[ \t]*$')
 gradle_line_matches = [
     re.compile(r'^[\t ]*signingConfig [^ ]*$'),
     re.compile(r'.*android\.signingConfigs\.[^{]*$'),
-    re.compile(r'.*variant\.outputFile = .*'),
-    re.compile(r'.*output\.outputFile = .*'),
     re.compile(r'.*\.readLine\(.*'),
 ]