From 06668ab1cde5cf442cdc1f58ad7e3c7c5df89dba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Thu, 16 Jan 2014 00:20:26 +0100 Subject: [PATCH] Run adapt_gradle before running gradle clean --- fdroidserver/build.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/fdroidserver/build.py b/fdroidserver/build.py index 0ad359e8..d52a033d 100644 --- a/fdroidserver/build.py +++ b/fdroidserver/build.py @@ -412,6 +412,7 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d p = FDroidPopen(cmd, cwd=maven_dir) elif thisbuild['type'] == 'gradle': + print "Cleaning Gradle project..." cmd = [config['gradle'], 'clean'] @@ -421,6 +422,10 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d else: gradle_dir = root_dir + adapt_gradle(gradle_dir) + for name, number, libpath in srclibpaths: + adapt_gradle(libpath) + p = FDroidPopen(cmd, cwd=gradle_dir) elif thisbuild['type'] == 'kivy': @@ -607,11 +612,6 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d 's@compileSdkVersion[ ]*[0-9]*@compileSdkVersion '+level+'@g', 'build.gradle'], cwd=gradle_dir) - adapt_gradle(gradle_dir) - - for name, number, libpath in srclibpaths: - adapt_gradle(libpath) - if len(flavours) == 1 and flavours[0] in ['main', 'yes', '']: flavours[0] = ''