From: Hans-Christoph Steiner <hans@eds.org>
Date: Mon, 27 Feb 2017 13:00:42 +0000 (+0100)
Subject: match versionCode/versionName when set as gradle variable
X-Git-Tag: 0.8~116^2~3
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=564cfb108971f00bbbbed4a5567c74bb8d821ea5;p=fdroidserver.git

match versionCode/versionName when set as gradle variable

For example, see org.kontalk:

allprojects {
    ext {
        appVersionCode = 221
        appVersionName = '4.0.1-preview'
    }
}
---

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index c13e2f94..e01b7115 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -1123,8 +1123,8 @@ def remove_debuggable_flags(root_dir):
                         os.path.join(root, 'AndroidManifest.xml'))
 
 
-vcsearch_g = re.compile(r'.*versionCode *=* *["\']*([0-9]+)["\']*').search
-vnsearch_g = re.compile(r'.*versionName *=* *(["\'])((?:(?=(\\?))\3.)*?)\1.*').search
+vcsearch_g = re.compile(r'''.*[Vv]ersionCode[ =]+["']*([0-9]+)["']*''').search
+vnsearch_g = re.compile(r'.*[Vv]ersionName *=* *(["\'])((?:(?=(\\?))\3.)*?)\1.*').search
 psearch_g = re.compile(r'.*(packageName|applicationId) *=* *["\']([^"]+)["\'].*').search