mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-09-19 03:30:12 +02:00
checkupdates improvements for gradle projects
* Let the package name override the one found in AndroidManifest.xml * Support the newer applicationId
This commit is contained in:
parent
41443edd55
commit
03deda914f
@ -991,7 +991,7 @@ def parse_androidmanifests(paths, ignoreversions=None):
|
|||||||
|
|
||||||
vcsearch_g = re.compile(r'.*versionCode *=* *["\']*([0-9]+)["\']*').search
|
vcsearch_g = re.compile(r'.*versionCode *=* *["\']*([0-9]+)["\']*').search
|
||||||
vnsearch_g = re.compile(r'.*versionName *=* *(["\'])((?:(?=(\\?))\3.)*?)\1.*').search
|
vnsearch_g = re.compile(r'.*versionName *=* *(["\'])((?:(?=(\\?))\3.)*?)\1.*').search
|
||||||
psearch_g = re.compile(r'.*packageName *=* *["\']([^"]+)["\'].*').search
|
psearch_g = re.compile(r'.*(packageName|applicationId) *=* *["\']([^"]+)["\'].*').search
|
||||||
|
|
||||||
ignoresearch = re.compile(ignoreversions).search if ignoreversions else None
|
ignoresearch = re.compile(ignoreversions).search if ignoreversions else None
|
||||||
|
|
||||||
@ -1008,15 +1008,16 @@ def parse_androidmanifests(paths, ignoreversions=None):
|
|||||||
gradle = has_extension(path, 'gradle')
|
gradle = has_extension(path, 'gradle')
|
||||||
version = None
|
version = None
|
||||||
vercode = None
|
vercode = None
|
||||||
# Remember package name, may be defined separately from version+vercode
|
package = None
|
||||||
package = max_package
|
|
||||||
|
|
||||||
if gradle:
|
if gradle:
|
||||||
for line in file(path):
|
for line in file(path):
|
||||||
|
# Grab first occurence of each to avoid running into
|
||||||
|
# alternative flavours and builds.
|
||||||
if not package:
|
if not package:
|
||||||
matches = psearch_g(line)
|
matches = psearch_g(line)
|
||||||
if matches:
|
if matches:
|
||||||
package = matches.group(1)
|
package = matches.group(2)
|
||||||
if not version:
|
if not version:
|
||||||
matches = vnsearch_g(line)
|
matches = vnsearch_g(line)
|
||||||
if matches:
|
if matches:
|
||||||
@ -1038,6 +1039,10 @@ def parse_androidmanifests(paths, ignoreversions=None):
|
|||||||
if string_is_integer(a):
|
if string_is_integer(a):
|
||||||
vercode = a
|
vercode = a
|
||||||
|
|
||||||
|
# Remember package name, may be defined separately from version+vercode
|
||||||
|
if package is None:
|
||||||
|
package = max_package
|
||||||
|
|
||||||
logging.debug("..got package={0}, version={1}, vercode={2}"
|
logging.debug("..got package={0}, version={1}, vercode={2}"
|
||||||
.format(package, version, vercode))
|
.format(package, version, vercode))
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user