Run adapt_gradle before running gradle clean

diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index 0ad359e800a1d8c9d8c374b8382960e0d188e631..d52a033d211d60fee965332e3d297566c92dccf4 100644 (file)
--- 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] = ''