Fix many cases of UCM for Gradle

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 98f837cd15a021156d2f159c725ab8a3e45016ba..fff688671fc3e85787a9e909009148ebcd96f2bd 100644 (file)
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -937,9 +937,9 @@ def parse_androidmanifests(paths):
     vnsearch = re.compile(r'.*android:versionName="([^"]+?)".*').search
     psearch = re.compile(r'.*package="([^"]+)".*').search
 
-    vcsearch_g = re.compile(r'.*versionCode[ ]+?([0-9]+?).*').search
-    vnsearch_g = re.compile(r'.*versionName[ ]+?"([^"]+?)".*').search
-    psearch_g = re.compile(r'.*packageName[ ]+?"([^"]+)".*').search
+    vcsearch_g = re.compile(r'.*versionCode[ =]*([0-9]+?).*').search
+    vnsearch_g = re.compile(r'.*versionName[ =]*"([^"]+?)".*').search
+    psearch_g = re.compile(r'.*packageName[ =]*"([^"]+)".*').search
 
     max_version = None
     max_vercode = None