Implement forceversion and forcevercode for gradle projects

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 11d820d4fee02741f2b6a9a5aae1f5f0118fb9a7..0dd733ee2784c6a154629327758f98a4378249a8 100644 (file)
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -1502,19 +1502,31 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, sdk_path,
         for path in manifest_paths(root_dir, flavour):
             if not os.path.isfile(path):
                 continue
-            if subprocess.call(['sed','-i',
-                's/android:versionName="[^"]*"/android:versionName="' + build['version'] + '"/g',
-                path]) != 0:
-                raise BuildException("Failed to amend manifest")
+            if path.endswith('.xml'):
+                if subprocess.call(['sed','-i',
+                    's/android:versionName="[^"]*"/android:versionName="' + build['version'] + '"/g',
+                    path]) != 0:
+                    raise BuildException("Failed to amend manifest")
+            elif path.endswith('.gradle'):
+                if subprocess.call(['sed','-i',
+                    's/versionName[ ]*=[ ]*"[^"]*"/versionName = "' + build['version'] + '"/g',
+                    path]) != 0:
+                    raise BuildException("Failed to amend build.gradle")
     if 'forcevercode' in build:
         print "Changing the version code..."
         for path in manifest_paths(root_dir, flavour):
             if not os.path.isfile(path):
                 continue
-            if subprocess.call(['sed','-i',
-                's/android:versionCode="[^"]*"/android:versionCode="' + build['vercode'] + '"/g',
-                path]) != 0:
-                raise BuildException("Failed to amend manifest")
+            if path.endswith('.xml'):
+                if subprocess.call(['sed','-i',
+                    's/android:versionCode="[^"]*"/android:versionCode="' + build['vercode'] + '"/g',
+                    path]) != 0:
+                    raise BuildException("Failed to amend manifest")
+            elif path.endswith('.gradle'):
+                if subprocess.call(['sed','-i',
+                    's/versionCode[ ]*=[ ]*[0-9]*/versionCode = ' + build['vercode'] + '/g',
+                    path]) != 0:
+                    raise BuildException("Failed to amend build.gradle")
 
     # Delete unwanted files...
     if 'rm' in build: