From 4482ba971d0b03846463cdae9f185ff58c0ab001 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Daniel=20Mart=C3=AD?= Date: Thu, 31 Dec 2015 09:37:08 +0100 Subject: [PATCH] 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. --- fdroidserver/build.py | 17 ++++++++++------- fdroidserver/common.py | 2 -- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/fdroidserver/build.py b/fdroidserver/build.py index 19df7215..7ad765b4 100644 --- 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 7666a1ad..60d1a7c7 100644 --- 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\(.*'), ] -- 2.30.2