From 71a09b700ea59de90a8b7200c3049af771a807fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Thu, 12 Jun 2014 10:04:20 +0200
Subject: [PATCH] Apk output path is build/outputs/apk/*.apk since 0.11

---
 fdroidserver/build.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index 065ea324..81c01e63 100644
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@ -760,7 +760,10 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
         else:
             name = '-'.join([basename, '-'.join(flavours), 'release', 'unsigned'])
         dd = os.path.normpath(dd)
-        src = os.path.join(dd, 'build', 'apk', name + '.apk')
+        if thisbuild['gradlepluginver'] >= LooseVersion('0.11'):
+            src = os.path.join(dd, 'build', 'outputs', 'apk', name + '.apk')
+        else:
+            src = os.path.join(dd, 'build', 'apk', name + '.apk')
     elif thisbuild['type'] == 'ant':
         stdout_apk = '\n'.join([
             line for line in p.stdout.splitlines() if '.apk' in line])