rename Build fields: version -> versionName, vercode -> versionCode

Since the YAML/JSON/etc. field names are now exactly the same as the field
names used in the internal dict in the Build class, this is a global rename

This keeps with the standard names used in Android:
https://developer.android.com/guide/topics/manifest/manifest-element.html

diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index ae3b702a75ce551d7d99e134a96404c46803366b..e2cc63894fb38091f004d34f4e0bcb58504f5ebf 100644 (file)
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@ -393,7 +393,7 @@ def build_server(app, build, vcs, build_dir, output_dir, force):
             cmdline += ' --force --test'
         if options.verbose:
             cmdline += ' --verbose'
-        cmdline += " %s:%s" % (app.id, build.vercode)
+        cmdline += " %s:%s" % (app.id, build.versionCode)
         chan.exec_command('bash --login -c "' + cmdline + '"')
 
         output = bytes()
@@ -413,7 +413,7 @@ def build_server(app, build, vcs, build_dir, output_dir, force):
         if returncode != 0:
             raise BuildException(
                 "Build.py failed on server for {0}:{1}".format(
-                    app.id, build.version), str(output, 'utf-8'))
+                    app.id, build.versionName), str(output, 'utf-8'))
 
         # Retrieve the built files...
         logging.info("Retrieving build output...")
@@ -430,7 +430,7 @@ def build_server(app, build, vcs, build_dir, output_dir, force):
         except:
             raise BuildException(
                 "Build failed for %s:%s - missing output files".format(
-                    app.id, build.version), output)
+                    app.id, build.versionName), output)
         ftp.close()
 
     finally:
@@ -499,8 +499,8 @@ def get_metadata_from_apk(app, build, apkfile):
         if nativecode is None:
             raise BuildException("Native code should have been built but none was packaged")
     if build.novcheck:
-        vercode = build.vercode
-        version = build.version
+        vercode = build.versionCode
+        version = build.versionName
     if not version or not vercode:
         raise BuildException("Could not find version information in build in output")
     if not foundid:
@@ -589,7 +589,7 @@ def build_local(app, build, vcs, build_dir, output_dir, srclib_dir, extlib_dir,
 
     if p is not None and p.returncode != 0:
         raise BuildException("Error cleaning %s:%s" %
-                             (app.id, build.version), p.output)
+                             (app.id, build.versionName), p.output)
 
     for root, dirs, files in os.walk(build_dir):
 
@@ -658,7 +658,7 @@ def build_local(app, build, vcs, build_dir, output_dir, srclib_dir, extlib_dir,
 
         if p.returncode != 0:
             raise BuildException("Error running build command for %s:%s" %
-                                 (app.id, build.version), p.output)
+                                 (app.id, build.versionName), p.output)
 
     # Build native stuff if required...
     if build.buildjni and build.buildjni != ['no']:
@@ -686,7 +686,7 @@ def build_local(app, build, vcs, build_dir, output_dir, srclib_dir, extlib_dir,
                 del manifest_text
             p = FDroidPopen(cmd, cwd=os.path.join(root_dir, d))
             if p.returncode != 0:
-                raise BuildException("NDK build failed for %s:%s" % (app.id, build.version), p.output)
+                raise BuildException("NDK build failed for %s:%s" % (app.id, build.versionName), p.output)
 
     p = None
     # Build the release...
@@ -800,8 +800,8 @@ def build_local(app, build, vcs, build_dir, output_dir, srclib_dir, extlib_dir,
         bindir = os.path.join(root_dir, 'bin')
 
     if p is not None and p.returncode != 0:
-        raise BuildException("Build failed for %s:%s" % (app.id, build.version), p.output)
-    logging.info("Successfully built version " + build.version + ' of ' + app.id)
+        raise BuildException("Build failed for %s:%s" % (app.id, build.versionName), p.output)
+    logging.info("Successfully built version " + build.versionName + ' of ' + app.id)
 
     omethod = build.output_method()
     if omethod == 'maven':
@@ -877,15 +877,15 @@ def build_local(app, build, vcs, build_dir, output_dir, srclib_dir, extlib_dir,
 
     if common.get_file_extension(src) == 'apk':
         vercode, version = get_metadata_from_apk(app, build, src)
-        if (version != build.version or vercode != build.vercode):
+        if (version != build.versionName or vercode != build.versionCode):
             raise BuildException(("Unexpected version/version code in output;"
                                   " APK: '%s' / '%s', "
                                   " Expected: '%s' / '%s'")
-                                 % (version, str(vercode), build.version,
-                                    str(build.vercode)))
+                                 % (version, str(vercode), build.versionName,
+                                    str(build.versionCode)))
     else:
-        vercode = build.vercode
-        version = build.version
+        vercode = build.versionCode
+        version = build.versionName
 
     # Add information for 'fdroid verify' to be able to reproduce the build
     # environment.
@@ -948,7 +948,7 @@ def trybuild(app, build, build_dir, output_dir, also_check_dir, srclib_dir, extl
         return False
 
     logging.info("Building version %s (%s) of %s" % (
-        build.version, build.vercode, app.id))
+        build.versionName, build.versionCode, app.id))
 
     if server:
         # When using server mode, still keep a local cache of the repo, by
@@ -1159,7 +1159,7 @@ def main():
                     vcs, build_dir = common.setup_vcs(app)
                     first = False
 
-                logging.debug("Checking " + build.version)
+                logging.debug("Checking " + build.versionName)
                 if trybuild(app, build, build_dir, output_dir,
                             also_check_dir, srclib_dir, extlib_dir,
                             tmp_dir, repo_dir, vcs, options.test,
@@ -1173,10 +1173,10 @@ def main():
                         # alongside our built one in the 'unsigend'
                         # directory.
                         url = app.Binaries
-                        url = url.replace('%v', build.version)
-                        url = url.replace('%c', str(build.vercode))
+                        url = url.replace('%v', build.versionName)
+                        url = url.replace('%c', str(build.versionCode))
                         logging.info("...retrieving " + url)
-                        of = "{0}_{1}.apk.binary".format(app.id, build.vercode)
+                        of = "{0}_{1}.apk.binary".format(app.id, build.versionCode)
                         of = os.path.join(output_dir, of)
                         net.download_file(url, local_filename=of)
 
@@ -1194,7 +1194,7 @@ def main():
                 with open(os.path.join(log_dir, appid + '.log'), 'a+') as f:
                     f.write('\n\n============================================================\n')
                     f.write('versionCode: %s\nversionName: %s\ncommit: %s\n' %
-                            (build.vercode, build.version, build.commit))
+                            (build.versionCode, build.versionName, build.commit))
                     f.write('Build completed at '
                             + time.strftime("%Y-%m-%d %H:%M:%SZ", time.gmtime()) + '\n')
                     f.write('\n' + tools_version_log + '\n')
@@ -1215,7 +1215,7 @@ def main():
             if options.wiki and wikilog:
                 try:
                     # Write a page with the last build log for this version code
-                    lastbuildpage = appid + '/lastbuild_' + build.vercode
+                    lastbuildpage = appid + '/lastbuild_' + build.versionCode
                     newpage = site.Pages[lastbuildpage]
                     with open(os.path.join('tmp', 'fdroidserverid')) as fp:
                         fdroidserverid = fp.read().rstrip()

diff --git a/fdroidserver/checkupdates.py b/fdroidserver/checkupdates.py
index 7f5314b8d72b44ee754fcffcf6a43665f9866849..91e5ecbe9d55cc9e0a18b7b95eb58230ae9900c2 100644 (file)
--- a/fdroidserver/checkupdates.py
+++ b/fdroidserver/checkupdates.py
@@ -462,22 +462,22 @@ def checkupdates_app(app, first=True):
             gotcur = False
             latest = None
             for build in app.builds:
-                if int(build.vercode) >= int(app.CurrentVersionCode):
+                if int(build.versionCode) >= int(app.CurrentVersionCode):
                     gotcur = True
-                if not latest or int(build.vercode) > int(latest.vercode):
+                if not latest or int(build.versionCode) > int(latest.versionCode):
                     latest = build
 
-            if int(latest.vercode) > int(app.CurrentVersionCode):
+            if int(latest.versionCode) > int(app.CurrentVersionCode):
                 logging.info("Refusing to auto update, since the latest build is newer")
 
             if not gotcur:
                 newbuild = copy.deepcopy(latest)
                 newbuild.disable = False
-                newbuild.vercode = app.CurrentVersionCode
-                newbuild.version = app.CurrentVersion + suffix
-                logging.info("...auto-generating build for " + newbuild.version)
-                commit = pattern.replace('%v', newbuild.version)
-                commit = commit.replace('%c', newbuild.vercode)
+                newbuild.versionCode = app.CurrentVersionCode
+                newbuild.versionName = app.CurrentVersion + suffix
+                logging.info("...auto-generating build for " + newbuild.versionName)
+                commit = pattern.replace('%v', newbuild.versionName)
+                commit = commit.replace('%c', newbuild.versionCode)
                 newbuild.commit = commit
                 app.builds.append(newbuild)
                 name = common.getappname(app)

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index dd11a57ac68703c98016b8775e041b37a08d4d47..5e0419b057bb6281170e7112b66d9b1746a99384 100644 (file)
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -443,10 +443,10 @@ def read_app_args(args, allapps, allow_vercodes=False):
         vc = vercodes[appid]
         if not vc:
             continue
-        app.builds = [b for b in app.builds if b.vercode in vc]
+        app.builds = [b for b in app.builds if b.versionCode in vc]
         if len(app.builds) != len(vercodes[appid]):
             error = True
-            allvcs = [b.vercode for b in app.builds]
+            allvcs = [b.versionCode for b in app.builds]
             for v in vercodes[appid]:
                 if v not in allvcs:
                     logging.critical("No such vercode %s for app %s" % (v, appid))
@@ -497,13 +497,13 @@ def publishednameinfo(filename):
 
 def get_release_filename(app, build):
     if build.output:
-        return "%s_%s.%s" % (app.id, build.vercode, get_file_extension(build.output))
+        return "%s_%s.%s" % (app.id, build.versionCode, get_file_extension(build.output))
     else:
-        return "%s_%s.apk" % (app.id, build.vercode)
+        return "%s_%s.apk" % (app.id, build.versionCode)
 
 
 def getsrcname(app, build):
-    return "%s_%s_src.tar.gz" % (app.id, build.vercode)
+    return "%s_%s_src.tar.gz" % (app.id, build.versionCode)
 
 
 def getappname(app):
@@ -1384,7 +1384,7 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, onserver=
         p = FDroidPopen(['bash', '-x', '-c', cmd], cwd=root_dir)
         if p.returncode != 0:
             raise BuildException("Error running init command for %s:%s" %
-                                 (app.id, build.version), p.output)
+                                 (app.id, build.versionName), p.output)
 
     # Apply patches if any
     if build.patch:
@@ -1475,11 +1475,11 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, onserver=
                 continue
             if has_extension(path, 'xml'):
                 regsub_file(r'android:versionName="[^"]*"',
-                            r'android:versionName="%s"' % build.version,
+                            r'android:versionName="%s"' % build.versionName,
                             path)
             elif has_extension(path, 'gradle'):
                 regsub_file(r"""(\s*)versionName[\s'"=]+.*""",
-                            r"""\1versionName '%s'""" % build.version,
+                            r"""\1versionName '%s'""" % build.versionName,
                             path)
 
     if build.forcevercode:
@@ -1489,11 +1489,11 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, onserver=
                 continue
             if has_extension(path, 'xml'):
                 regsub_file(r'android:versionCode="[^"]*"',
-                            r'android:versionCode="%s"' % build.vercode,
+                            r'android:versionCode="%s"' % build.versionCode,
                             path)
             elif has_extension(path, 'gradle'):
                 regsub_file(r'versionCode[ =]+[0-9]+',
-                            r'versionCode %s' % build.vercode,
+                            r'versionCode %s' % build.versionCode,
                             path)
 
     # Delete unwanted files
@@ -1541,7 +1541,7 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, onserver=
         p = FDroidPopen(['bash', '-x', '-c', cmd], cwd=root_dir)
         if p.returncode != 0:
             raise BuildException("Error running prebuild command for %s:%s" %
-                                 (app.id, build.version), p.output)
+                                 (app.id, build.versionName), p.output)
 
     # Generate (or update) the ant build file, build.xml...
     if build.build_method() == 'ant' and build.androidupdate != ['no']:
@@ -1918,8 +1918,8 @@ def replace_config_vars(cmd, build):
     cmd = cmd.replace('$$QT$$', config['qt_sdk_path'] or '')
     if build is not None:
         cmd = cmd.replace('$$COMMIT$$', build.commit)
-        cmd = cmd.replace('$$VERSION$$', build.version)
-        cmd = cmd.replace('$$VERCODE$$', build.vercode)
+        cmd = cmd.replace('$$VERSION$$', build.versionName)
+        cmd = cmd.replace('$$VERCODE$$', build.versionCode)
     return cmd
 
 

diff --git a/fdroidserver/dscanner.py b/fdroidserver/dscanner.py
index 84915b9a2322974eacdf045a28de6f7b37c7f4f4..8e224bdb06d6b65273fb2b80837a6ffc736cc5e3 100644 (file)
--- a/fdroidserver/dscanner.py
+++ b/fdroidserver/dscanner.py
@@ -457,7 +457,7 @@ def main():
         for build in reversed(app.builds):
             if build.disable:
                 continue
-            if options.latest or vercode == 0 or build.vercode == vercode:
+            if options.latest or vercode == 0 or build.versionCode == vercode:
                 app.builds = [build]
                 break
             continue
@@ -467,7 +467,7 @@ def main():
         for build in app.builds:
             apks = []
             for f in os.listdir(options.repo_path):
-                n = "%v_%v.apk".format(app_id, build.vercode)
+                n = "%v_%v.apk".format(app_id, build.versionCode)
                 if f == n:
                     apks.append(f)
             for apk in sorted(apks):

diff --git a/fdroidserver/import.py b/fdroidserver/import.py
index 5ba4323cf1625c311425d0140f0536affcab390e..8090abb744fc1fc5faf78be9917e4e153f7c87af 100644 (file)
--- a/fdroidserver/import.py
+++ b/fdroidserver/import.py
@@ -230,13 +230,13 @@ def main():
     paths = common.manifest_paths(root_dir, [])
     if paths:
 
-        version, vercode, package = common.parse_androidmanifests(paths, app)
+        versionName, versionCode, package = common.parse_androidmanifests(paths, app)
         if not package:
             logging.error("Couldn't find package ID")
             sys.exit(1)
-        if not version:
+        if not versionName:
             logging.warn("Couldn't find latest version name")
-        if not vercode:
+        if not versionCode:
             logging.warn("Couldn't find latest version code")
     else:
         spec = os.path.join(root_dir, 'buildozer.spec')
@@ -246,8 +246,8 @@ def main():
             bconfig = ConfigParser(defaults, allow_no_value=True)
             bconfig.read(spec)
             package = bconfig.get('app', 'package.domain') + '.' + bconfig.get('app', 'package.name')
-            version = bconfig.get('app', 'version')
-            vercode = None
+            versionName = bconfig.get('app', 'version')
+            versionCode = None
         else:
             logging.error("No android or kivy project could be found. Specify --subdir?")
             sys.exit(1)
@@ -258,8 +258,8 @@ def main():
         sys.exit(1)
 
     # Create a build line...
-    build.version = version or '?'
-    build.vercode = vercode or '?'
+    build.versionName = versionName or '?'
+    build.versionCode = versionCode or '?'
     if options.subdir:
         build.subdir = options.subdir
     if os.path.exists(os.path.join(root_dir, 'jni')):

diff --git a/fdroidserver/lint.py b/fdroidserver/lint.py
index f70097c4c3d9cbc051a68e22acc1f674c585ce79..b9c0eaf84e690c19d04476b3d2f266b710c5314d 100644 (file)
--- a/fdroidserver/lint.py
+++ b/fdroidserver/lint.py
@@ -139,10 +139,10 @@ def get_lastbuild(builds):
     lastbuild = None
     for build in builds:
         if not build.disable:
-            vercode = int(build.vercode)
+            vercode = int(build.versionCode)
             if lowest_vercode == -1 or vercode < lowest_vercode:
                 lowest_vercode = vercode
-        if not lastbuild or int(build.vercode) > int(lastbuild.vercode):
+        if not lastbuild or int(build.versionCode) > int(lastbuild.versionCode):
             lastbuild = build
     return lastbuild
 
@@ -153,7 +153,7 @@ def check_ucm_tags(app):
             and lastbuild.commit
             and app.UpdateCheckMode == 'RepoManifest'
             and not lastbuild.commit.startswith('unknown')
-            and lastbuild.vercode == app.CurrentVersionCode
+            and lastbuild.versionCode == app.CurrentVersionCode
             and not lastbuild.forcevercode
             and any(s in lastbuild.commit for s in '.,_-/')):
         yield "Last used commit '%s' looks like a tag, but Update Check Mode is '%s'" % (
@@ -307,7 +307,7 @@ def check_builds(app):
             continue
         for s in ['master', 'origin', 'HEAD', 'default', 'trunk']:
             if build.commit and build.commit.startswith(s):
-                yield "Branch '%s' used as commit in build '%s'" % (s, build.version)
+                yield "Branch '%s' used as commit in build '%s'" % (s, build.versionName)
             for srclib in build.srclibs:
                 ref = srclib.split('@')[1].split('/')[0]
                 if ref.startswith(s):
@@ -330,7 +330,7 @@ def check_files_dir(app):
     for build in app.builds:
         for fname in build.patch:
             if fname not in files:
-                yield "Unknown file %s in build '%s'" % (fname, build.version)
+                yield "Unknown file %s in build '%s'" % (fname, build.versionName)
             else:
                 used.add(fname)
 
@@ -355,7 +355,7 @@ def check_extlib_dir(apps):
         for build in app.builds:
             for path in build.extlibs:
                 if path not in files:
-                    yield "%s: Unknown extlib %s in build '%s'" % (app.id, path, build.version)
+                    yield "%s: Unknown extlib %s in build '%s'" % (app.id, path, build.versionName)
                 else:
                     used.add(path)
 

diff --git a/fdroidserver/metadata.py b/fdroidserver/metadata.py
index 6d9d9e0ec611416923eb63fed4227e07d28839fe..0d446f54cbe930d3b384e67039faf4d01127b026 100644 (file)
--- a/fdroidserver/metadata.py
+++ b/fdroidserver/metadata.py
@@ -238,7 +238,7 @@ build_flags_order = [
 ]
 
 
-build_flags = set(build_flags_order + ['version', 'vercode'])
+build_flags = set(build_flags_order + ['versionName', 'versionCode'])
 
 
 class Build(dict):
@@ -801,7 +801,7 @@ def get_default_app_info(metadatapath=None):
 
 
 def sorted_builds(builds):
-    return sorted(builds, key=lambda build: int(build.vercode))
+    return sorted(builds, key=lambda build: int(build.versionCode))
 
 
 esc_newlines = re.compile(r'\\( |\n)')
@@ -978,9 +978,9 @@ def parse_txt_metadata(mf, app):
         if len(parts) < 3:
             warn_or_exception("Invalid build format: " + v + " in " + mf.name)
         build = Build()
-        build.version = parts[0]
-        build.vercode = parts[1]
-        check_versionCode(build.vercode)
+        build.versionName = parts[0]
+        build.versionCode = parts[1]
+        check_versionCode(build.versionCode)
 
         if parts[2].startswith('!'):
             # For backwards compatibility, handle old-style disabling,
@@ -1038,10 +1038,10 @@ def parse_txt_metadata(mf, app):
             else:
                 if not build.commit and not build.disable:
                     warn_or_exception("No commit specified for {0} in {1}"
-                                      .format(build.version, linedesc))
+                                      .format(build.versionName, linedesc))
 
                 app.builds.append(build)
-                add_comments('build:' + build.vercode)
+                add_comments('build:' + build.versionCode)
                 mode = 0
 
         if mode == 0:
@@ -1086,21 +1086,22 @@ def parse_txt_metadata(mf, app):
                 else:
                     build = parse_buildline([v])
                     app.builds.append(build)
-                    add_comments('build:' + app.builds[-1].vercode)
+                    add_comments('build:' + app.builds[-1].versionCode)
             elif ftype == TYPE_BUILD_V2:
                 vv = v.split(',')
                 if len(vv) != 2:
                     warn_or_exception('Build should have comma-separated',
-                                      'version and vercode,',
+                                      'versionName and versionCode,',
                                       'not "{0}", in {1}'.format(v, linedesc))
                 build = Build()
-                build.version = vv[0]
-                build.vercode = vv[1]
-                check_versionCode(build.vercode)
-                if build.vercode in vc_seen:
-                    warn_or_exception('Duplicate build recipe found for vercode %s in %s'
-                                      % (build.vercode, linedesc))
-                vc_seen.add(build.vercode)
+                build.versionName = vv[0]
+                build.versionCode = vv[1]
+                check_versionCode(build.versionCode)
+
+                if build.versionCode in vc_seen:
+                    warn_or_exception('Duplicate build recipe found for versionCode %s in %s'
+                                      % (build.versionCode, linedesc))
+                vc_seen.add(build.versionCode)
                 del buildlines[:]
                 mode = 3
             elif ftype == TYPE_OBSOLETE:
@@ -1121,7 +1122,7 @@ def parse_txt_metadata(mf, app):
                 buildlines.append(line)
                 build = parse_buildline(buildlines)
                 app.builds.append(build)
-                add_comments('build:' + app.builds[-1].vercode)
+                add_comments('build:' + app.builds[-1].versionCode)
                 mode = 0
     add_comments(None)
 
@@ -1209,10 +1210,10 @@ def write_plaintext_metadata(mf, app, w_comment, w_field, w_build):
 
     for build in app.builds:
 
-        if build.version == "Ignore":
+        if build.versionName == "Ignore":
             continue
 
-        w_comments('build:%s' % build.vercode)
+        w_comments('build:%s' % build.versionCode)
         w_build(build)
         mf.write('\n')
 
@@ -1254,7 +1255,7 @@ def write_txt(mf, app):
         mf.write("%s:%s\n" % (f, v))
 
     def w_build(build):
-        mf.write("Build:%s,%s\n" % (build.version, build.vercode))
+        mf.write("Build:%s,%s\n" % (build.versionName, build.versionCode))
 
         for f in build_flags_order:
             v = build.get(f)
@@ -1337,8 +1338,8 @@ def write_yaml(mf, app):
             mf.write("builds:\n")
             first_build = False
 
-        w_field('versionName', build.version, '  - ', TYPE_STRING)
-        w_field('versionCode', build.vercode, '    ', TYPE_STRING)
+        w_field('versionName', build.versionName, '  - ', TYPE_STRING)
+        w_field('versionCode', build.versionCode, '    ', TYPE_STRING)
         for f in build_flags_order:
             v = build.get(f)
             if not v:

diff --git a/fdroidserver/scanner.py b/fdroidserver/scanner.py
index af7fee06891e2cfdb71229d76d53f79ac0d227e4..8e031fcb8b8778e8ccb8a69d0933b48b719aaa38 100644 (file)
--- a/fdroidserver/scanner.py
+++ b/fdroidserver/scanner.py
@@ -296,9 +296,9 @@ def main():
 
                 if build.disable:
                     logging.info("...skipping version %s - %s" % (
-                        build.version, build.get('disable', build.commit[1:])))
+                        build.versionName, build.get('disable', build.commit[1:])))
                 else:
-                    logging.info("...scanning version " + build.version)
+                    logging.info("...scanning version " + build.versionName)
 
                     # Prepare the source code...
                     root_dir, _ = common.prepare_source(vcs, app, build,
@@ -309,7 +309,7 @@ def main():
                     count = scan_source(build_dir, root_dir, build)
                     if count > 0:
                         logging.warn('Scanner found %d problems in %s (%s)' % (
-                            count, appid, build.vercode))
+                            count, appid, build.versionCode))
                         probcount += count
 
         except BuildException as be:

diff --git a/fdroidserver/update.py b/fdroidserver/update.py
index 98396d27bad461d150b5c08a3dccc0ad4d186b71..ea536152123befec9adb29aea9c58ba1bb855bd3 100644 (file)
--- a/fdroidserver/update.py
+++ b/fdroidserver/update.py
@@ -156,24 +156,24 @@ def update_wiki(apps, sortedids, apks):
         # Include ones we can't build, as a special case...
         for build in app.builds:
             if build.disable:
-                if build.vercode == app.CurrentVersionCode:
+                if build.versionCode == app.CurrentVersionCode:
                     cantupdate = True
                 # TODO: Nasty: vercode is a string in the build, and an int elsewhere
-                apklist.append({'versioncode': int(build.vercode),
-                                'version': build.version,
+                apklist.append({'versioncode': int(build.versionCode),
+                                'version': build.versionName,
                                 'buildproblem': "The build for this version was manually disabled. Reason: {0}".format(build.disable),
                                 })
             else:
                 builtit = False
                 for apk in apklist:
-                    if apk['versioncode'] == int(build.vercode):
+                    if apk['versioncode'] == int(build.versionCode):
                         builtit = True
                         break
                 if not builtit:
                     buildfails = True
-                    apklist.append({'versioncode': int(build.vercode),
-                                    'version': build.version,
-                                    'buildproblem': "The build for this version appears to have failed. Check the [[{0}/lastbuild_{1}|build log]].".format(appid, build.vercode),
+                    apklist.append({'versioncode': int(build.versionCode),
+                                    'version': build.versionName,
+                                    'buildproblem': "The build for this version appears to have failed. Check the [[{0}/lastbuild_{1}|build log]].".format(appid, build.versionCode),
                                     })
         if app.CurrentVersionCode == '0':
             cantupdate = True
@@ -305,10 +305,10 @@ def delete_disabled_builds(apps, apkcache, repodirs):
         for build in app['builds']:
             if not build.disable:
                 continue
-            apkfilename = appid + '_' + str(build.vercode) + '.apk'
+            apkfilename = appid + '_' + str(build.versionCode) + '.apk'
             iconfilename = "%s.%s.png" % (
                 appid,
-                build.vercode)
+                build.versionCode)
             for repodir in repodirs:
                 files = [
                     os.path.join(repodir, apkfilename),

diff --git a/tests/common.TestCase b/tests/common.TestCase
index c95ec9decc94c9f4f97b5e2b4ce135f39771c851..9e00904fc53ffa0ab08659dbadb743789fb80a71 100755 (executable)
--- a/tests/common.TestCase
+++ b/tests/common.TestCase
@@ -124,8 +124,8 @@ class CommonTest(unittest.TestCase):
         build.forcevercode = True
         build.gradle = ['yes']
         build.target = 'android-' + str(testint)
-        build.version = teststr
-        build.vercode = testint
+        build.versionName = teststr
+        build.versionCode = testint
 
         class FakeVcs():
             # no need to change to the correct commit here
@@ -145,8 +145,8 @@ class CommonTest(unittest.TestCase):
         with open(os.path.join(testdir, 'AndroidManifest.xml')) as f:
             filedata = f.read()
         self.assertIsNone(re.search('android:debuggable', filedata))
-        self.assertIsNotNone(re.search('android:versionName="%s"' % build.version, filedata))
-        self.assertIsNotNone(re.search('android:versionCode="%s"' % build.vercode, filedata))
+        self.assertIsNotNone(re.search('android:versionName="%s"' % build.versionName, filedata))
+        self.assertIsNotNone(re.search('android:versionCode="%s"' % build.versionCode, filedata))
 
     def test_fdroid_popen_stderr_redirect(self):
         commands = ['sh', '-c', 'echo stdout message && echo stderr message 1>&2']

diff --git a/tests/metadata/dump/org.adaway.yaml b/tests/metadata/dump/org.adaway.yaml
index e3b87a96bfb5652c31965d00c0e869e7aa80e684..c028e297a5f301fa6b8c8edd9409514f88632d12 100644 (file)
--- a/tests/metadata/dump/org.adaway.yaml
+++ b/tests/metadata/dump/org.adaway.yaml
@@ -87,8 +87,8 @@ builds:
   subdir: org_adaway/
   submodules: false
   target: null
-  vercode: '13'
-  version: '1.12'
+  versionCode: '13'
+  versionName: '1.12'
 - androidupdate: []
   antcommands: []
   build: ''
@@ -119,8 +119,8 @@ builds:
   subdir: org_adaway/
   submodules: false
   target: null
-  vercode: '16'
-  version: '1.15'
+  versionCode: '16'
+  versionName: '1.15'
 - androidupdate: []
   antcommands: []
   build: ''
@@ -151,8 +151,8 @@ builds:
   subdir: org_adaway/
   submodules: false
   target: null
-  vercode: '19'
-  version: '1.18'
+  versionCode: '19'
+  versionName: '1.18'
 - androidupdate: []
   antcommands: []
   build: ''
@@ -183,8 +183,8 @@ builds:
   subdir: org_adaway/
   submodules: false
   target: null
-  vercode: '20'
-  version: '1.19'
+  versionCode: '20'
+  versionName: '1.19'
 - androidupdate: []
   antcommands: []
   build: ''
@@ -215,8 +215,8 @@ builds:
   subdir: org_adaway/
   submodules: false
   target: null
-  vercode: '21'
-  version: '1.20'
+  versionCode: '21'
+  versionName: '1.20'
 - androidupdate: []
   antcommands: []
   build: ''
@@ -247,8 +247,8 @@ builds:
   subdir: org_adaway/
   submodules: false
   target: null
-  vercode: '22'
-  version: '1.21'
+  versionCode: '22'
+  versionName: '1.21'
 - androidupdate: []
   antcommands: []
   build: ''
@@ -278,8 +278,8 @@ builds:
   subdir: null
   submodules: false
   target: null
-  vercode: '24'
-  version: '1.23'
+  versionCode: '24'
+  versionName: '1.23'
 - androidupdate: []
   antcommands: []
   build: ''
@@ -309,8 +309,8 @@ builds:
   subdir: org_adaway/
   submodules: false
   target: null
-  vercode: '25'
-  version: '1.24'
+  versionCode: '25'
+  versionName: '1.24'
 - androidupdate: []
   antcommands: []
   build: ''
@@ -340,8 +340,8 @@ builds:
   subdir: org_adaway/
   submodules: false
   target: null
-  vercode: '26'
-  version: '1.25'
+  versionCode: '26'
+  versionName: '1.25'
 - androidupdate: []
   antcommands: []
   build: ''
@@ -371,8 +371,8 @@ builds:
   subdir: org_adaway/
   submodules: false
   target: null
-  vercode: '27'
-  version: '1.26'
+  versionCode: '27'
+  versionName: '1.26'
 - androidupdate: []
   antcommands: []
   build: ''
@@ -402,8 +402,8 @@ builds:
   subdir: org_adaway/
   submodules: false
   target: null
-  vercode: '28'
-  version: '1.27'
+  versionCode: '28'
+  versionName: '1.27'
 - androidupdate: []
   antcommands: []
   build: ''
@@ -433,8 +433,8 @@ builds:
   subdir: org_adaway/
   submodules: false
   target: null
-  vercode: '30'
-  version: '1.29'
+  versionCode: '30'
+  versionName: '1.29'
 - androidupdate: []
   antcommands: []
   build: ''
@@ -465,8 +465,8 @@ builds:
   subdir: org_adaway/
   submodules: false
   target: null
-  vercode: '33'
-  version: '1.32'
+  versionCode: '33'
+  versionName: '1.32'
 - androidupdate: []
   antcommands: []
   build: ''
@@ -496,8 +496,8 @@ builds:
   subdir: org_adaway/
   submodules: false
   target: null
-  vercode: '34'
-  version: '1.33'
+  versionCode: '34'
+  versionName: '1.33'
 - androidupdate: []
   antcommands: []
   build: ''
@@ -528,8 +528,8 @@ builds:
   subdir: org_adaway/
   submodules: false
   target: null
-  vercode: '35'
-  version: '1.34'
+  versionCode: '35'
+  versionName: '1.34'
 - androidupdate: []
   antcommands: []
   build: ''
@@ -560,8 +560,8 @@ builds:
   subdir: org_adaway/
   submodules: false
   target: null
-  vercode: '36'
-  version: '1.35'
+  versionCode: '36'
+  versionName: '1.35'
 - androidupdate: []
   antcommands: []
   build: ''
@@ -592,8 +592,8 @@ builds:
   subdir: org_adaway/
   submodules: false
   target: null
-  vercode: '37'
-  version: '1.36'
+  versionCode: '37'
+  versionName: '1.36'
 - androidupdate: []
   antcommands: []
   build: ''
@@ -624,8 +624,8 @@ builds:
   subdir: org_adaway/
   submodules: false
   target: null
-  vercode: '38'
-  version: '1.37'
+  versionCode: '38'
+  versionName: '1.37'
 - androidupdate:
   - .
   - android-libs/Donations
@@ -667,8 +667,8 @@ builds:
   subdir: AdAway
   submodules: false
   target: null
-  vercode: '40'
-  version: '2.1'
+  versionCode: '40'
+  versionName: '2.1'
 - androidupdate:
   - .
   - android-libs/Donations
@@ -710,8 +710,8 @@ builds:
   subdir: AdAway
   submodules: false
   target: null
-  vercode: '42'
-  version: '2.3'
+  versionCode: '42'
+  versionName: '2.3'
 - androidupdate: []
   antcommands: []
   build: ''
@@ -742,8 +742,8 @@ builds:
   subdir: AdAway
   submodules: false
   target: null
-  vercode: '45'
-  version: '2.6'
+  versionCode: '45'
+  versionName: '2.6'
 - androidupdate: []
   antcommands: []
   build: ''
@@ -774,8 +774,8 @@ builds:
   subdir: AdAway
   submodules: false
   target: null
-  vercode: '46'
-  version: '2.7'
+  versionCode: '46'
+  versionName: '2.7'
 - androidupdate: []
   antcommands: []
   build: ''
@@ -806,8 +806,8 @@ builds:
   subdir: AdAway
   submodules: false
   target: null
-  vercode: '47'
-  version: '2.8'
+  versionCode: '47'
+  versionName: '2.8'
 - androidupdate: []
   antcommands: []
   build: ''
@@ -838,8 +838,8 @@ builds:
   subdir: AdAway
   submodules: false
   target: null
-  vercode: '48'
-  version: 2.8.1
+  versionCode: '48'
+  versionName: 2.8.1
 - androidupdate: []
   antcommands: []
   build: ''
@@ -870,8 +870,8 @@ builds:
   subdir: AdAway
   submodules: false
   target: null
-  vercode: '49'
-  version: '2.9'
+  versionCode: '49'
+  versionName: '2.9'
 - androidupdate: []
   antcommands: []
   build: ''
@@ -902,8 +902,8 @@ builds:
   subdir: AdAway
   submodules: false
   target: null
-  vercode: '50'
-  version: 2.9.1
+  versionCode: '50'
+  versionName: 2.9.1
 - androidupdate: []
   antcommands: []
   build: ''
@@ -934,8 +934,8 @@ builds:
   subdir: AdAway
   submodules: false
   target: null
-  vercode: '51'
-  version: 2.9.2
+  versionCode: '51'
+  versionName: 2.9.2
 - androidupdate: []
   antcommands: []
   build: ''
@@ -966,8 +966,8 @@ builds:
   subdir: AdAway
   submodules: false
   target: null
-  vercode: '52'
-  version: '3.0'
+  versionCode: '52'
+  versionName: '3.0'
 comments:
   build:40:
   - '#RootCommands srclib needs changing on fdroidserver'

diff --git a/tests/metadata/dump/org.smssecure.smssecure.yaml b/tests/metadata/dump/org.smssecure.smssecure.yaml
index 5d26d0ebf83eb72cfd2cba73c39495c03d32ac9e..b8b4e692ee6ad5a618a106875ea9be69f24ea156 100644 (file)
--- a/tests/metadata/dump/org.smssecure.smssecure.yaml
+++ b/tests/metadata/dump/org.smssecure.smssecure.yaml
@@ -96,8 +96,8 @@ builds:
   subdir: null
   submodules: false
   target: null
-  vercode: '5'
-  version: 0.3.3
+  versionCode: '5'
+  versionName: 0.3.3
 - androidupdate: []
   antcommands: []
   build: ''
@@ -131,8 +131,8 @@ builds:
   subdir: null
   submodules: true
   target: null
-  vercode: '6'
-  version: 0.3.3
+  versionCode: '6'
+  versionName: 0.3.3
 - androidupdate: []
   antcommands: []
   build: ''
@@ -165,8 +165,8 @@ builds:
   subdir: null
   submodules: true
   target: null
-  vercode: '9'
-  version: 0.4.2
+  versionCode: '9'
+  versionName: 0.4.2
 - androidupdate: []
   antcommands: []
   build: ''
@@ -199,8 +199,8 @@ builds:
   subdir: null
   submodules: true
   target: null
-  vercode: '11'
-  version: 0.5.1
+  versionCode: '11'
+  versionName: 0.5.1
 - androidupdate: []
   antcommands: []
   build: ''
@@ -232,8 +232,8 @@ builds:
   subdir: null
   submodules: true
   target: null
-  vercode: '12'
-  version: 0.5.2
+  versionCode: '12'
+  versionName: 0.5.2
 - androidupdate: []
   antcommands: []
   build: ''
@@ -265,8 +265,8 @@ builds:
   subdir: null
   submodules: true
   target: null
-  vercode: '100'
-  version: 0.5.3
+  versionCode: '100'
+  versionName: 0.5.3
 - androidupdate: []
   antcommands: []
   build: ''
@@ -298,8 +298,8 @@ builds:
   subdir: null
   submodules: true
   target: null
-  vercode: '101'
-  version: 0.5.4
+  versionCode: '101'
+  versionName: 0.5.4
 - androidupdate: []
   antcommands: []
   build: ''
@@ -331,8 +331,8 @@ builds:
   subdir: null
   submodules: true
   target: null
-  vercode: '102'
-  version: 0.6.0
+  versionCode: '102'
+  versionName: 0.6.0
 comments: {}
 id: org.smssecure.smssecure
 lastupdated: null

diff --git a/tests/metadata/dump/org.videolan.vlc.yaml b/tests/metadata/dump/org.videolan.vlc.yaml
index cf7cc6f01b70e162550b117263d2dc6b1b454730..801b56f75fb1f580c4e7103ca424c29bc955e965 100644 (file)
--- a/tests/metadata/dump/org.videolan.vlc.yaml
+++ b/tests/metadata/dump/org.videolan.vlc.yaml
@@ -89,8 +89,8 @@ builds:
   subdir: vlc-android
   submodules: false
   target: null
-  vercode: 110
-  version: 0.0.11-ARMv7
+  versionCode: 110
+  versionName: 0.0.11-ARMv7
 - androidupdate:
   - .
   - ../java-libs/SlidingMenu
@@ -123,8 +123,8 @@ builds:
   subdir: vlc-android
   submodules: false
   target: null
-  vercode: 111
-  version: 0.0.11-ARM
+  versionCode: 111
+  versionName: 0.0.11-ARM
 - androidupdate:
   - .
   - ../java-libs/SlidingMenu
@@ -157,8 +157,8 @@ builds:
   subdir: vlc-android
   submodules: false
   target: null
-  vercode: 112
-  version: 0.0.11-x86
+  versionCode: 112
+  versionName: 0.0.11-x86
 - androidupdate:
   - .
   - ../java-libs/SlidingMenu
@@ -191,8 +191,8 @@ builds:
   subdir: vlc-android
   submodules: false
   target: null
-  vercode: 113
-  version: 0.0.11-mips
+  versionCode: 113
+  versionName: 0.0.11-mips
 - androidupdate: []
   antcommands: []
   build: cd ../ && ANDROID_ABI=mips ./compile.sh release
@@ -224,8 +224,8 @@ builds:
   subdir: vlc-android
   submodules: false
   target: null
-  vercode: 1301
-  version: 0.1.3-MIPS
+  versionCode: 1301
+  versionName: 0.1.3-MIPS
 - androidupdate: []
   antcommands: []
   build: cd ../ && ANDROID_ABI=x86 ./compile.sh release
@@ -257,8 +257,8 @@ builds:
   subdir: vlc-android
   submodules: false
   target: null
-  vercode: 1302
-  version: 0.1.3-x86
+  versionCode: 1302
+  versionName: 0.1.3-x86
 - androidupdate: []
   antcommands: []
   build: cd ../ && ANDROID_ABI=armeabi ./compile.sh release
@@ -290,8 +290,8 @@ builds:
   subdir: vlc-android
   submodules: false
   target: null
-  vercode: 1303
-  version: 0.1.3-ARM
+  versionCode: 1303
+  versionName: 0.1.3-ARM
 - androidupdate: []
   antcommands: []
   build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release
@@ -323,8 +323,8 @@ builds:
   subdir: vlc-android
   submodules: false
   target: null
-  vercode: 1304
-  version: 0.1.3-ARMv7
+  versionCode: 1304
+  versionName: 0.1.3-ARMv7
 - androidupdate: []
   antcommands: []
   build: cd ../ && ANDROID_ABI=x86 ./compile.sh release
@@ -355,8 +355,8 @@ builds:
   subdir: vlc-android
   submodules: false
   target: null
-  vercode: 9002
-  version: 0.9.0
+  versionCode: 9002
+  versionName: 0.9.0
 - androidupdate: []
   antcommands: []
   build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release
@@ -387,8 +387,8 @@ builds:
   subdir: vlc-android
   submodules: false
   target: null
-  vercode: 9004
-  version: 0.9.0
+  versionCode: 9004
+  versionName: 0.9.0
 - androidupdate: []
   antcommands: []
   build: cd ../ && ANDROID_ABI=x86 ./compile.sh release
@@ -419,8 +419,8 @@ builds:
   subdir: vlc-android
   submodules: false
   target: null
-  vercode: 9102
-  version: 0.9.1
+  versionCode: 9102
+  versionName: 0.9.1
 - androidupdate: []
   antcommands: []
   build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release
@@ -451,8 +451,8 @@ builds:
   subdir: vlc-android
   submodules: false
   target: null
-  vercode: 9104
-  version: 0.9.1
+  versionCode: 9104
+  versionName: 0.9.1
 - androidupdate: []
   antcommands: []
   build: cd ../ && ANDROID_ABI=x86 ./compile.sh release
@@ -483,8 +483,8 @@ builds:
   subdir: vlc-android
   submodules: false
   target: null
-  vercode: 9502
-  version: 0.9.5
+  versionCode: 9502
+  versionName: 0.9.5
 - androidupdate: []
   antcommands: []
   build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release
@@ -515,8 +515,8 @@ builds:
   subdir: vlc-android
   submodules: false
   target: null
-  vercode: 9504
-  version: 0.9.5
+  versionCode: 9504
+  versionName: 0.9.5
 - androidupdate: []
   antcommands: []
   build: cd ../ && ANDROID_ABI=x86 ./compile.sh release
@@ -547,8 +547,8 @@ builds:
   subdir: vlc-android
   submodules: false
   target: null
-  vercode: 9602
-  version: 0.9.6
+  versionCode: 9602
+  versionName: 0.9.6
 - androidupdate: []
   antcommands: []
   build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release
@@ -579,8 +579,8 @@ builds:
   subdir: vlc-android
   submodules: false
   target: null
-  vercode: 9604
-  version: 0.9.6
+  versionCode: 9604
+  versionName: 0.9.6
 - androidupdate: []
   antcommands: []
   build: cd ../ && ANDROID_ABI=x86 ./compile.sh release
@@ -611,8 +611,8 @@ builds:
   subdir: vlc-android
   submodules: false
   target: null
-  vercode: 9702
-  version: 0.9.7
+  versionCode: 9702
+  versionName: 0.9.7
 - androidupdate: []
   antcommands: []
   build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release
@@ -643,8 +643,8 @@ builds:
   subdir: vlc-android
   submodules: false
   target: null
-  vercode: 9704
-  version: 0.9.7
+  versionCode: 9704
+  versionName: 0.9.7
 - androidupdate: []
   antcommands: []
   build: cd ../ && ANDROID_ABI=mips ./compile.sh release
@@ -675,8 +675,8 @@ builds:
   subdir: vlc-android
   submodules: false
   target: null
-  vercode: 9711
-  version: 0.9.7.1
+  versionCode: 9711
+  versionName: 0.9.7.1
 - androidupdate: []
   antcommands: []
   build: cd ../ && ANDROID_ABI=x86 ./compile.sh release
@@ -707,8 +707,8 @@ builds:
   subdir: vlc-android
   submodules: false
   target: null
-  vercode: 9712
-  version: 0.9.7.1
+  versionCode: 9712
+  versionName: 0.9.7.1
 - androidupdate: []
   antcommands: []
   build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release
@@ -739,8 +739,8 @@ builds:
   subdir: vlc-android
   submodules: false
   target: null
-  vercode: 9714
-  version: 0.9.7.1
+  versionCode: 9714
+  versionName: 0.9.7.1
 - androidupdate: []
   antcommands: []
   build: cd ../ && ANDROID_ABI=x86 ./compile.sh release
@@ -771,8 +771,8 @@ builds:
   subdir: vlc-android
   submodules: false
   target: null
-  vercode: 9802
-  version: 0.9.8
+  versionCode: 9802
+  versionName: 0.9.8
 - androidupdate: []
   antcommands: []
   build: cd ../ && ANDROID_ABI=armeabi ./compile.sh release
@@ -803,8 +803,8 @@ builds:
   subdir: vlc-android
   submodules: false
   target: null
-  vercode: 9803
-  version: 0.9.8
+  versionCode: 9803
+  versionName: 0.9.8
 - androidupdate: []
   antcommands: []
   build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release
@@ -835,8 +835,8 @@ builds:
   subdir: vlc-android
   submodules: false
   target: null
-  vercode: 9804
-  version: 0.9.8
+  versionCode: 9804
+  versionName: 0.9.8
 - androidupdate: []
   antcommands: []
   build: cd ../ && ANDROID_ABI=x86 ./compile.sh release
@@ -867,8 +867,8 @@ builds:
   subdir: vlc-android
   submodules: false
   target: null
-  vercode: 9902
-  version: 0.9.9
+  versionCode: 9902
+  versionName: 0.9.9
 - androidupdate: []
   antcommands: []
   build: cd ../ && ANDROID_ABI=armeabi ./compile.sh release
@@ -899,8 +899,8 @@ builds:
   subdir: vlc-android
   submodules: false
   target: null
-  vercode: 9903
-  version: 0.9.9
+  versionCode: 9903
+  versionName: 0.9.9
 - androidupdate: []
   antcommands: []
   build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release
@@ -931,8 +931,8 @@ builds:
   subdir: vlc-android
   submodules: false
   target: null
-  vercode: 9904
-  version: 0.9.9
+  versionCode: 9904
+  versionName: 0.9.9
 - androidupdate: []
   antcommands: []
   build: cd ../ && ANDROID_ABI=x86 ./compile.sh release
@@ -963,8 +963,8 @@ builds:
   subdir: vlc-android
   submodules: false
   target: null
-  vercode: 10002
-  version: 0.9.10
+  versionCode: 10002
+  versionName: 0.9.10
 - androidupdate: []
   antcommands: []
   build: cd ../ && ANDROID_ABI=armeabi ./compile.sh release
@@ -995,8 +995,8 @@ builds:
   subdir: vlc-android
   submodules: false
   target: null
-  vercode: 10003
-  version: 0.9.10
+  versionCode: 10003
+  versionName: 0.9.10
 - androidupdate: []
   antcommands: []
   build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release
@@ -1027,8 +1027,8 @@ builds:
   subdir: vlc-android
   submodules: false
   target: null
-  vercode: 10004
-  version: 0.9.10
+  versionCode: 10004
+  versionName: 0.9.10
 - androidupdate: []
   antcommands: []
   build: cd ../ && ANDROID_ABI=x86 ./compile.sh release
@@ -1059,8 +1059,8 @@ builds:
   subdir: vlc-android
   submodules: false
   target: null
-  vercode: 10006
-  version: 1.0.0
+  versionCode: 10006
+  versionName: 1.0.0
 - androidupdate: []
   antcommands: []
   build: cd ../ && ANDROID_ABI=armeabi ./compile.sh release
@@ -1091,8 +1091,8 @@ builds:
   subdir: vlc-android
   submodules: false
   target: null
-  vercode: 10007
-  version: 1.0.0
+  versionCode: 10007
+  versionName: 1.0.0
 - androidupdate: []
   antcommands: []
   build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release
@@ -1123,8 +1123,8 @@ builds:
   subdir: vlc-android
   submodules: false
   target: null
-  vercode: 10008
-  version: 1.0.0
+  versionCode: 10008
+  versionName: 1.0.0
 - androidupdate: []
   antcommands: []
   build: cd ../ && ANDROID_ABI=x86 ./compile.sh release
@@ -1155,8 +1155,8 @@ builds:
   subdir: vlc-android
   submodules: false
   target: null
-  vercode: 10102
-  version: 1.0.1
+  versionCode: 10102
+  versionName: 1.0.1
 - androidupdate: []
   antcommands: []
   build: cd ../ && ANDROID_ABI=armeabi ./compile.sh release
@@ -1187,8 +1187,8 @@ builds:
   subdir: vlc-android
   submodules: false
   target: null
-  vercode: 10103
-  version: 1.0.1
+  versionCode: 10103
+  versionName: 1.0.1
 - androidupdate: []
   antcommands: []
   build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release
@@ -1219,8 +1219,8 @@ builds:
   subdir: vlc-android
   submodules: false
   target: null
-  vercode: 10104
-  version: 1.0.1
+  versionCode: 10104
+  versionName: 1.0.1
 - androidupdate: []
   antcommands: []
   build: cd ../ && ./compile.sh -a "armeabi" --release
@@ -1253,8 +1253,8 @@ builds:
   subdir: vlc-android
   submodules: false
   target: null
-  vercode: 1010303
-  version: 1.1.3
+  versionCode: 1010303
+  versionName: 1.1.3
 - androidupdate: []
   antcommands: []
   build: cd ../ && ./compile.sh -a "armeabi-v7a" --release
@@ -1287,8 +1287,8 @@ builds:
   subdir: vlc-android
   submodules: false
   target: null
-  vercode: 1010304
-  version: 1.1.3
+  versionCode: 1010304
+  versionName: 1.1.3
 - androidupdate: []
   antcommands: []
   build: cd ../ && ./compile.sh -a "x86" --release
@@ -1321,8 +1321,8 @@ builds:
   subdir: vlc-android
   submodules: false
   target: null
-  vercode: 1010305
-  version: 1.1.3
+  versionCode: 1010305
+  versionName: 1.1.3
 - androidupdate: []
   antcommands: []
   build: cd ../ && ./compile.sh -a "armeabi" --release
@@ -1355,8 +1355,8 @@ builds:
   subdir: vlc-android
   submodules: false
   target: null
-  vercode: 1010503
-  version: 1.1.5
+  versionCode: 1010503
+  versionName: 1.1.5
 - androidupdate: []
   antcommands: []
   build: cd ../ && ./compile.sh -a "armeabi-v7a" --release
@@ -1389,8 +1389,8 @@ builds:
   subdir: vlc-android
   submodules: false
   target: null
-  vercode: 1010504
-  version: 1.1.5
+  versionCode: 1010504
+  versionName: 1.1.5
 - androidupdate: []
   antcommands: []
   build: cd ../ && ./compile.sh -a "x86" --release
@@ -1423,8 +1423,8 @@ builds:
   subdir: vlc-android
   submodules: false
   target: null
-  vercode: 1010505
-  version: 1.1.5
+  versionCode: 1010505
+  versionName: 1.1.5
 - androidupdate: []
   antcommands: []
   build: cd ../ && ./compile.sh -a "armeabi" --release
@@ -1457,8 +1457,8 @@ builds:
   subdir: vlc-android
   submodules: false
   target: null
-  vercode: 1010603
-  version: 1.1.6
+  versionCode: 1010603
+  versionName: 1.1.6
 - androidupdate: []
   antcommands: []
   build: cd ../ && ./compile.sh -a "armeabi-v7a" --release
@@ -1491,8 +1491,8 @@ builds:
   subdir: vlc-android
   submodules: false
   target: null
-  vercode: 1010604
-  version: 1.1.6
+  versionCode: 1010604
+  versionName: 1.1.6
 - androidupdate: []
   antcommands: []
   build: cd ../ && ./compile.sh -a "x86" --release
@@ -1525,8 +1525,8 @@ builds:
   subdir: vlc-android
   submodules: false
   target: null
-  vercode: 1010605
-  version: 1.1.6
+  versionCode: 1010605
+  versionName: 1.1.6
 - androidupdate: []
   antcommands: []
   build: cd ../ && ./compile.sh -a "armeabi" --release
@@ -1559,8 +1559,8 @@ builds:
   subdir: vlc-android
   submodules: false
   target: null
-  vercode: 1020003
-  version: 1.2.0
+  versionCode: 1020003
+  versionName: 1.2.0
 - androidupdate: []
   antcommands: []
   build: cd ../ && ./compile.sh -a "armeabi-v7a" --release
@@ -1593,8 +1593,8 @@ builds:
   subdir: vlc-android
   submodules: false
   target: null
-  vercode: 1020004
-  version: 1.2.0
+  versionCode: 1020004
+  versionName: 1.2.0
 - androidupdate: []
   antcommands: []
   build: cd ../ && ./compile.sh -a "x86" --release
@@ -1627,8 +1627,8 @@ builds:
   subdir: vlc-android
   submodules: false
   target: null
-  vercode: 1020005
-  version: 1.2.0
+  versionCode: 1020005
+  versionName: 1.2.0
 - androidupdate: []
   antcommands: []
   build: cd ../ && ./compile.sh -a "armeabi" --release
@@ -1661,8 +1661,8 @@ builds:
   subdir: vlc-android
   submodules: false
   target: null
-  vercode: 1020103
-  version: 1.2.1
+  versionCode: 1020103
+  versionName: 1.2.1
 - androidupdate: []
   antcommands: []
   build: cd ../ && ./compile.sh -a "armeabi-v7a" --release
@@ -1695,8 +1695,8 @@ builds:
   subdir: vlc-android
   submodules: false
   target: null
-  vercode: 1020104
-  version: 1.2.1
+  versionCode: 1020104
+  versionName: 1.2.1
 - androidupdate: []
   antcommands: []
   build: cd ../ && ./compile.sh -a "x86" --release
@@ -1729,8 +1729,8 @@ builds:
   subdir: vlc-android
   submodules: false
   target: null
-  vercode: 1020105
-  version: 1.2.1
+  versionCode: 1020105
+  versionName: 1.2.1
 - androidupdate: []
   antcommands: []
   build: cd ../ && ./compile.sh -a "armeabi" --release
@@ -1763,8 +1763,8 @@ builds:
   subdir: vlc-android
   submodules: false
   target: null
-  vercode: 1020203
-  version: 1.2.2
+  versionCode: 1020203
+  versionName: 1.2.2
 - androidupdate: []
   antcommands: []
   build: cd ../ && ./compile.sh -a "armeabi-v7a" --release
@@ -1797,8 +1797,8 @@ builds:
   subdir: vlc-android
   submodules: false
   target: null
-  vercode: 1020204
-  version: 1.2.2
+  versionCode: 1020204
+  versionName: 1.2.2
 - androidupdate: []
   antcommands: []
   build: cd ../ && ./compile.sh -a "x86" --release
@@ -1831,8 +1831,8 @@ builds:
   subdir: vlc-android
   submodules: false
   target: null
-  vercode: 1020205
-  version: 1.2.2
+  versionCode: 1020205
+  versionName: 1.2.2
 - androidupdate: []
   antcommands: []
   build: cd ../ && ./compile.sh -a "armeabi" --release
@@ -1865,8 +1865,8 @@ builds:
   subdir: vlc-android
   submodules: false
   target: null
-  vercode: 1020303
-  version: 1.2.3
+  versionCode: 1020303
+  versionName: 1.2.3
 - androidupdate: []
   antcommands: []
   build: cd ../ && ./compile.sh -a "armeabi-v7a" --release
@@ -1899,8 +1899,8 @@ builds:
   subdir: vlc-android
   submodules: false
   target: null
-  vercode: 1020304
-  version: 1.2.3
+  versionCode: 1020304
+  versionName: 1.2.3
 - androidupdate: []
   antcommands: []
   build: cd ../ && ./compile.sh -a "x86" --release
@@ -1933,8 +1933,8 @@ builds:
   subdir: vlc-android
   submodules: false
   target: null
-  vercode: 1020305
-  version: 1.2.3
+  versionCode: 1020305
+  versionName: 1.2.3
 - androidupdate: []
   antcommands: []
   build: cd ../ && ./compile.sh -a "armeabi" --release
@@ -1967,8 +1967,8 @@ builds:
   subdir: vlc-android
   submodules: false
   target: null
-  vercode: 1020403
-  version: 1.2.4
+  versionCode: 1020403
+  versionName: 1.2.4
 - androidupdate: []
   antcommands: []
   build: cd ../ && ./compile.sh -a "armeabi-v7a" --release
@@ -2001,8 +2001,8 @@ builds:
   subdir: vlc-android
   submodules: false
   target: null
-  vercode: 1020404
-  version: 1.2.4
+  versionCode: 1020404
+  versionName: 1.2.4
 - androidupdate: []
   antcommands: []
   build: cd ../ && ./compile.sh -a "x86" --release
@@ -2035,8 +2035,8 @@ builds:
   subdir: vlc-android
   submodules: false
   target: null
-  vercode: 1020405
-  version: 1.2.4
+  versionCode: 1020405
+  versionName: 1.2.4
 - androidupdate: []
   antcommands: []
   build: cd ../ && ./compile.sh -a "armeabi" --release
@@ -2069,8 +2069,8 @@ builds:
   subdir: vlc-android
   submodules: false
   target: null
-  vercode: 1020503
-  version: 1.2.5
+  versionCode: 1020503
+  versionName: 1.2.5
 - androidupdate: []
   antcommands: []
   build: cd ../ && ./compile.sh -a "armeabi-v7a" --release
@@ -2103,8 +2103,8 @@ builds:
   subdir: vlc-android
   submodules: false
   target: null
-  vercode: 1020504
-  version: 1.2.5
+  versionCode: 1020504
+  versionName: 1.2.5
 - androidupdate: []
   antcommands: []
   build: cd ../ && ./compile.sh -a "x86" --release
@@ -2137,8 +2137,8 @@ builds:
   subdir: vlc-android
   submodules: false
   target: null
-  vercode: 1020505
-  version: 1.2.5
+  versionCode: 1020505
+  versionName: 1.2.5
 - androidupdate: []
   antcommands: []
   build: cd ../ && ./compile.sh -a "armeabi" --release
@@ -2171,8 +2171,8 @@ builds:
   subdir: vlc-android
   submodules: false
   target: null
-  vercode: 1030003
-  version: 1.2.6
+  versionCode: 1030003
+  versionName: 1.2.6
 - androidupdate: []
   antcommands: []
   build: cd ../ && ./compile.sh -a "armeabi-v7a" --release
@@ -2205,8 +2205,8 @@ builds:
   subdir: vlc-android
   submodules: false
   target: null
-  vercode: 1030004
-  version: 1.2.6
+  versionCode: 1030004
+  versionName: 1.2.6
 - androidupdate: []
   antcommands: []
   build: cd ../ && ./compile.sh -a "x86" --release
@@ -2239,8 +2239,8 @@ builds:
   subdir: vlc-android
   submodules: false
   target: null
-  vercode: 1030005
-  version: 1.2.6
+  versionCode: 1030005
+  versionName: 1.2.6
 comments: {}
 id: org.videolan.vlc
 lastupdated: null