diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a3d61ba6..057d9c23 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -58,6 +58,7 @@ metadata_v0: - ../tests/dump_internal_metadata_format.py - sed -i -e "/buildozer/d" + -e 's,maven\(\W\) false,maven\1 null,' metadata/dump_*/*.yaml - diff -uw metadata/dump_* diff --git a/CHANGELOG.md b/CHANGELOG.md index a6961bbf..8caa5483 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,17 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) +## unreleased + +### Added + +### Fixed + +### Removed + +* The `maven:` field is now always a string, with `yes` as a legacy special + value. It is no longer treated like a boolean in any case. + ## [2.2.1] - 2023-03-09 ### Added diff --git a/fdroidserver/metadata.py b/fdroidserver/metadata.py index 2fee07b3..b16f34af 100644 --- a/fdroidserver/metadata.py +++ b/fdroidserver/metadata.py @@ -265,7 +265,7 @@ class Build(dict): self.init = '' self.patch = [] self.gradle = [] - self.maven = False + self.maven = None self.output = None self.binary = None self.srclibs = [] @@ -641,10 +641,7 @@ def post_metadata_parse(app): elif flagtype(k) is TYPE_INT: build[k] = v elif flagtype(k) is TYPE_STRING: - if k == 'maven': - build[k] = v - else: - build[k] = str(v) + build[k] = str(v) builds.append(build) app['Builds'] = sorted_builds(builds) @@ -898,9 +895,6 @@ def write_yaml(mf, app): value = getattr(build, field) if field == 'gradle' and value == ['off']: value = [ruamel.yaml.scalarstring.SingleQuotedScalarString('off')] - if field in ('maven'): - if value == 'no': - continue typ = flagtype(field) # don't check value == True for TYPE_INT as it could be 0 if value is not None and (typ == TYPE_INT or value): diff --git a/tests/build.TestCase b/tests/build.TestCase index 7129d1bf..a00f4f75 100755 --- a/tests/build.TestCase +++ b/tests/build.TestCase @@ -214,6 +214,79 @@ class BuildTest(unittest.TestCase): self.assertEqual(versionCode, vc) self.assertEqual(versionName, vn) + @mock.patch('fdroidserver.common.get_apk_id') + @mock.patch('fdroidserver.build.FDroidPopen') + @mock.patch('fdroidserver.common.is_apk_and_debuggable', lambda f: False) + @mock.patch('fdroidserver.common.get_native_code', lambda f: 'x86') + def test_build_local_maven(self, fake_FDroidPopen, fake_get_apk_id): + """Test build_local() with a maven project""" + + # pylint: disable=unused-argument + def _side_effect(cmd, cwd=None): + p = mock.MagicMock() + p.output = '[INFO] fake apkbuilder target/no.apk' + with open(os.path.join(self.testdir, 'target', 'no.apk'), 'w') as fp: + fp.write('placeholder') + p.returncode = 0 + return p + + fake_FDroidPopen.side_effect = _side_effect + os.chdir(self.testdir) + os.mkdir('target') + config = dict() + fdroidserver.common.fill_config_defaults(config) + fdroidserver.common.config = config + fdroidserver.build.config = config + fdroidserver.build.options = mock.Mock() + fdroidserver.build.options.scan_binary = False + fdroidserver.build.options.notarball = True + fdroidserver.build.options.skipscan = False + + app = fdroidserver.metadata.App() + app.id = 'mocked.app.id' + build = fdroidserver.metadata.Build() + build.commit = '1.0' + build.versionCode = 1 + build.versionName = '1.0' + fake_get_apk_id.side_effect = lambda f: ( + app.id, + build.versionCode, + build.versionName, + ) + vcs = mock.Mock() + + build.maven = 'yes@..' + fdroidserver.build.build_local( + app, + build, + vcs, + build_dir=self.testdir, + output_dir=self.testdir, + log_dir=os.getcwd(), + srclib_dir=None, + extlib_dir=None, + tmp_dir=None, + force=False, + onserver=True, + refresh=False, + ) + + build.maven = 'yes' + fdroidserver.build.build_local( + app, + build, + vcs, + build_dir=self.testdir, + output_dir=self.testdir, + log_dir=os.getcwd(), + srclib_dir=None, + extlib_dir=None, + tmp_dir=None, + force=False, + onserver=True, + refresh=False, + ) + @mock.patch('sdkmanager.build_package_list', lambda use_net: None) def test_build_local_ndk(self): """Test if `fdroid build` detects installed NDKs and auto-installs when missing""" diff --git a/tests/deploy.TestCase b/tests/deploy.TestCase index a577ee9d..d35200be 100755 --- a/tests/deploy.TestCase +++ b/tests/deploy.TestCase @@ -7,6 +7,7 @@ import os import sys import tempfile import unittest +from pathlib import Path from unittest import mock localmodule = os.path.realpath( @@ -17,7 +18,7 @@ if localmodule not in sys.path: import fdroidserver.common import fdroidserver.deploy -from testcommon import TmpCwd +from testcommon import TmpCwd, mkdtemp class DeployTest(unittest.TestCase): @@ -26,13 +27,38 @@ class DeployTest(unittest.TestCase): def setUp(self): logging.basicConfig(level=logging.DEBUG) self.basedir = os.path.join(localmodule, 'tests') + os.chdir(self.basedir) + self._td = mkdtemp() + self.testdir = self._td.name fdroidserver.deploy.options = mock.Mock() fdroidserver.deploy.config = {} + def tearDown(self): + self._td.cleanup() + + def test_update_serverwebroot(self): + os.chdir(self.testdir) + repo = Path('repo') + repo.mkdir(parents=True) + fake_apk = repo / 'fake.apk' + with fake_apk.open('w') as fp: + fp.write('not an APK, but has the right filename') + serverwebroot = Path('serverwebroot') + serverwebroot.mkdir() + + # setup parameters for this test run + fdroidserver.deploy.options.identity_file = None + fdroidserver.deploy.config['make_current_version_link'] = False + + dest_apk = Path(serverwebroot) / fake_apk + self.assertFalse(dest_apk.is_file()) + fdroidserver.deploy.update_serverwebroot(str(serverwebroot), 'repo') + self.assertTrue(dest_apk.is_file()) + def test_update_serverwebroot_make_cur_version_link(self): # setup parameters for this test run - fdroidserver.deploy.options.no_chcksum = True + fdroidserver.deploy.options.no_checksum = True fdroidserver.deploy.options.identity_file = None fdroidserver.deploy.options.verbose = False fdroidserver.deploy.options.quiet = True diff --git a/tests/metadata/dump/com.politedroid.yaml b/tests/metadata/dump/com.politedroid.yaml index ec9903bd..4f4be52b 100644 --- a/tests/metadata/dump/com.politedroid.yaml +++ b/tests/metadata/dump/com.politedroid.yaml @@ -27,7 +27,7 @@ Builds: gradle: [] gradleprops: [] init: '' - maven: false + maven: null ndk: null novcheck: false oldsdkloc: false @@ -62,7 +62,7 @@ Builds: gradle: [] gradleprops: [] init: '' - maven: false + maven: null ndk: null novcheck: false oldsdkloc: false @@ -97,7 +97,7 @@ Builds: gradle: [] gradleprops: [] init: '' - maven: false + maven: null ndk: null novcheck: false oldsdkloc: false @@ -133,7 +133,7 @@ Builds: - 'yes' gradleprops: [] init: '' - maven: false + maven: null ndk: null novcheck: false oldsdkloc: false diff --git a/tests/metadata/dump/org.adaway.yaml b/tests/metadata/dump/org.adaway.yaml index a1ab971e..0428721c 100644 --- a/tests/metadata/dump/org.adaway.yaml +++ b/tests/metadata/dump/org.adaway.yaml @@ -25,7 +25,7 @@ Builds: gradle: [] gradleprops: [] init: '' - maven: false + maven: null ndk: null novcheck: false oldsdkloc: false @@ -61,7 +61,7 @@ Builds: gradle: [] gradleprops: [] init: '' - maven: false + maven: null ndk: null novcheck: false oldsdkloc: false @@ -98,7 +98,7 @@ Builds: gradle: [] gradleprops: [] init: '' - maven: false + maven: null ndk: null novcheck: false oldsdkloc: false @@ -135,7 +135,7 @@ Builds: gradle: [] gradleprops: [] init: '' - maven: false + maven: null ndk: null novcheck: false oldsdkloc: false @@ -172,7 +172,7 @@ Builds: gradle: [] gradleprops: [] init: '' - maven: false + maven: null ndk: null novcheck: false oldsdkloc: false @@ -209,7 +209,7 @@ Builds: gradle: [] gradleprops: [] init: '' - maven: false + maven: null ndk: null novcheck: false oldsdkloc: false @@ -245,7 +245,7 @@ Builds: gradle: [] gradleprops: [] init: '' - maven: false + maven: null ndk: null novcheck: false oldsdkloc: false @@ -281,7 +281,7 @@ Builds: gradle: [] gradleprops: [] init: '' - maven: false + maven: null ndk: null novcheck: false oldsdkloc: false @@ -318,7 +318,7 @@ Builds: gradle: [] gradleprops: [] init: '' - maven: false + maven: null ndk: null novcheck: false oldsdkloc: false @@ -355,7 +355,7 @@ Builds: gradle: [] gradleprops: [] init: '' - maven: false + maven: null ndk: null novcheck: false oldsdkloc: false @@ -392,7 +392,7 @@ Builds: gradle: [] gradleprops: [] init: '' - maven: false + maven: null ndk: null novcheck: false oldsdkloc: false @@ -429,7 +429,7 @@ Builds: gradle: [] gradleprops: [] init: '' - maven: false + maven: null ndk: null novcheck: false oldsdkloc: false @@ -466,7 +466,7 @@ Builds: gradle: [] gradleprops: [] init: '' - maven: false + maven: null ndk: null novcheck: false oldsdkloc: false @@ -504,7 +504,7 @@ Builds: gradle: [] gradleprops: [] init: '' - maven: false + maven: null ndk: null novcheck: false oldsdkloc: false @@ -541,7 +541,7 @@ Builds: gradle: [] gradleprops: [] init: '' - maven: false + maven: null ndk: null novcheck: false oldsdkloc: false @@ -579,7 +579,7 @@ Builds: gradle: [] gradleprops: [] init: '' - maven: false + maven: null ndk: null novcheck: false oldsdkloc: false @@ -617,7 +617,7 @@ Builds: gradle: [] gradleprops: [] init: '' - maven: false + maven: null ndk: null novcheck: false oldsdkloc: false @@ -655,7 +655,7 @@ Builds: gradle: [] gradleprops: [] init: '' - maven: false + maven: null ndk: null novcheck: false oldsdkloc: false @@ -701,7 +701,7 @@ Builds: init: - rm android-libs/Donations/custom_rules.xml - git clone https://github.com/dschuermann/HtmlSpanner android-libs/HtmlSpanner - maven: false + maven: null ndk: null novcheck: false oldsdkloc: false @@ -751,7 +751,7 @@ Builds: init: - rm android-libs/Donations/custom_rules.xml - git clone https://github.com/dschuermann/HtmlSpanner android-libs/HtmlSpanner - maven: false + maven: null ndk: null novcheck: false oldsdkloc: false @@ -795,7 +795,7 @@ Builds: - 'yes' gradleprops: [] init: '' - maven: false + maven: null ndk: null novcheck: false oldsdkloc: false @@ -833,7 +833,7 @@ Builds: - 'yes' gradleprops: [] init: '' - maven: false + maven: null ndk: null novcheck: false oldsdkloc: false @@ -871,7 +871,7 @@ Builds: - 'yes' gradleprops: [] init: '' - maven: false + maven: null ndk: null novcheck: false oldsdkloc: false @@ -909,7 +909,7 @@ Builds: - 'yes' gradleprops: [] init: '' - maven: false + maven: null ndk: null novcheck: false oldsdkloc: false @@ -947,7 +947,7 @@ Builds: - 'yes' gradleprops: [] init: '' - maven: false + maven: null ndk: null novcheck: false oldsdkloc: false @@ -985,7 +985,7 @@ Builds: - 'yes' gradleprops: [] init: '' - maven: false + maven: null ndk: null novcheck: false oldsdkloc: false @@ -1023,7 +1023,7 @@ Builds: - 'yes' gradleprops: [] init: '' - maven: false + maven: null ndk: null novcheck: false oldsdkloc: false @@ -1061,7 +1061,7 @@ Builds: - 'yes' gradleprops: [] init: '' - maven: false + maven: null ndk: null novcheck: false oldsdkloc: false diff --git a/tests/metadata/dump/org.smssecure.smssecure.yaml b/tests/metadata/dump/org.smssecure.smssecure.yaml index 98493478..1637ad5a 100644 --- a/tests/metadata/dump/org.smssecure.smssecure.yaml +++ b/tests/metadata/dump/org.smssecure.smssecure.yaml @@ -25,7 +25,7 @@ Builds: - 'yes' gradleprops: [] init: '' - maven: false + maven: null ndk: null novcheck: false oldsdkloc: false @@ -86,7 +86,7 @@ Builds: - 'yes' gradleprops: [] init: '' - maven: false + maven: null ndk: null novcheck: false oldsdkloc: false @@ -129,7 +129,7 @@ Builds: - 'yes' gradleprops: [] init: '' - maven: false + maven: null ndk: null novcheck: false oldsdkloc: false @@ -170,7 +170,7 @@ Builds: - 'yes' gradleprops: [] init: '' - maven: false + maven: null ndk: null novcheck: false oldsdkloc: false @@ -211,7 +211,7 @@ Builds: - 'yes' gradleprops: [] init: '' - maven: false + maven: null ndk: null novcheck: false oldsdkloc: false @@ -251,7 +251,7 @@ Builds: - 'yes' gradleprops: [] init: '' - maven: false + maven: null ndk: null novcheck: false oldsdkloc: false @@ -291,7 +291,7 @@ Builds: - 'yes' gradleprops: [] init: '' - maven: false + maven: null ndk: null novcheck: false oldsdkloc: false @@ -331,7 +331,7 @@ Builds: - 'yes' gradleprops: [] init: '' - maven: false + maven: null ndk: null novcheck: false oldsdkloc: false diff --git a/tests/metadata/dump/org.videolan.vlc.yaml b/tests/metadata/dump/org.videolan.vlc.yaml index 3ac2ed74..42620442 100644 --- a/tests/metadata/dump/org.videolan.vlc.yaml +++ b/tests/metadata/dump/org.videolan.vlc.yaml @@ -28,7 +28,7 @@ Builds: gradle: [] gradleprops: [] init: '' - maven: false + maven: null ndk: null novcheck: false oldsdkloc: false @@ -68,7 +68,7 @@ Builds: gradle: [] gradleprops: [] init: '' - maven: false + maven: null ndk: null novcheck: false oldsdkloc: false @@ -108,7 +108,7 @@ Builds: gradle: [] gradleprops: [] init: '' - maven: false + maven: null ndk: null novcheck: false oldsdkloc: false @@ -148,7 +148,7 @@ Builds: gradle: [] gradleprops: [] init: '' - maven: false + maven: null ndk: null novcheck: false oldsdkloc: false @@ -185,7 +185,7 @@ Builds: gradle: [] gradleprops: [] init: '' - maven: false + maven: null ndk: null novcheck: false oldsdkloc: false @@ -224,7 +224,7 @@ Builds: gradle: [] gradleprops: [] init: '' - maven: false + maven: null ndk: null novcheck: false oldsdkloc: false @@ -263,7 +263,7 @@ Builds: gradle: [] gradleprops: [] init: '' - maven: false + maven: null ndk: null novcheck: false oldsdkloc: false @@ -302,7 +302,7 @@ Builds: gradle: [] gradleprops: [] init: '' - maven: false + maven: null ndk: null novcheck: false oldsdkloc: false @@ -341,7 +341,7 @@ Builds: gradle: [] gradleprops: [] init: '' - maven: false + maven: null ndk: null novcheck: false oldsdkloc: false @@ -379,7 +379,7 @@ Builds: gradle: [] gradleprops: [] init: '' - maven: false + maven: null ndk: null novcheck: false oldsdkloc: false @@ -417,7 +417,7 @@ Builds: gradle: [] gradleprops: [] init: '' - maven: false + maven: null ndk: null novcheck: false oldsdkloc: false @@ -455,7 +455,7 @@ Builds: gradle: [] gradleprops: [] init: '' - maven: false + maven: null ndk: null novcheck: false oldsdkloc: false @@ -493,7 +493,7 @@ Builds: gradle: [] gradleprops: [] init: '' - maven: false + maven: null ndk: null novcheck: false oldsdkloc: false @@ -531,7 +531,7 @@ Builds: gradle: [] gradleprops: [] init: '' - maven: false + maven: null ndk: null novcheck: false oldsdkloc: false @@ -569,7 +569,7 @@ Builds: gradle: [] gradleprops: [] init: '' - maven: false + maven: null ndk: null novcheck: false oldsdkloc: false @@ -607,7 +607,7 @@ Builds: gradle: [] gradleprops: [] init: '' - maven: false + maven: null ndk: null novcheck: false oldsdkloc: false @@ -645,7 +645,7 @@ Builds: gradle: [] gradleprops: [] init: '' - maven: false + maven: null ndk: null novcheck: false oldsdkloc: false @@ -683,7 +683,7 @@ Builds: gradle: [] gradleprops: [] init: '' - maven: false + maven: null ndk: null novcheck: false oldsdkloc: false @@ -721,7 +721,7 @@ Builds: gradle: [] gradleprops: [] init: '' - maven: false + maven: null ndk: null novcheck: false oldsdkloc: false @@ -759,7 +759,7 @@ Builds: gradle: [] gradleprops: [] init: '' - maven: false + maven: null ndk: null novcheck: false oldsdkloc: false @@ -797,7 +797,7 @@ Builds: gradle: [] gradleprops: [] init: '' - maven: false + maven: null ndk: null novcheck: false oldsdkloc: false @@ -835,7 +835,7 @@ Builds: gradle: [] gradleprops: [] init: '' - maven: false + maven: null ndk: null novcheck: false oldsdkloc: false @@ -873,7 +873,7 @@ Builds: gradle: [] gradleprops: [] init: '' - maven: false + maven: null ndk: null novcheck: false oldsdkloc: false @@ -911,7 +911,7 @@ Builds: gradle: [] gradleprops: [] init: '' - maven: false + maven: null ndk: null novcheck: false oldsdkloc: false @@ -949,7 +949,7 @@ Builds: gradle: [] gradleprops: [] init: '' - maven: false + maven: null ndk: null novcheck: false oldsdkloc: false @@ -987,7 +987,7 @@ Builds: gradle: [] gradleprops: [] init: '' - maven: false + maven: null ndk: null novcheck: false oldsdkloc: false @@ -1025,7 +1025,7 @@ Builds: gradle: [] gradleprops: [] init: '' - maven: false + maven: null ndk: null novcheck: false oldsdkloc: false @@ -1063,7 +1063,7 @@ Builds: gradle: [] gradleprops: [] init: '' - maven: false + maven: null ndk: null novcheck: false oldsdkloc: false @@ -1101,7 +1101,7 @@ Builds: gradle: [] gradleprops: [] init: '' - maven: false + maven: null ndk: null novcheck: false oldsdkloc: false @@ -1139,7 +1139,7 @@ Builds: gradle: [] gradleprops: [] init: '' - maven: false + maven: null ndk: null novcheck: false oldsdkloc: false @@ -1177,7 +1177,7 @@ Builds: gradle: [] gradleprops: [] init: '' - maven: false + maven: null ndk: null novcheck: false oldsdkloc: false @@ -1215,7 +1215,7 @@ Builds: gradle: [] gradleprops: [] init: '' - maven: false + maven: null ndk: null novcheck: false oldsdkloc: false @@ -1253,7 +1253,7 @@ Builds: gradle: [] gradleprops: [] init: '' - maven: false + maven: null ndk: null novcheck: false oldsdkloc: false @@ -1291,7 +1291,7 @@ Builds: gradle: [] gradleprops: [] init: '' - maven: false + maven: null ndk: null novcheck: false oldsdkloc: false @@ -1329,7 +1329,7 @@ Builds: gradle: [] gradleprops: [] init: '' - maven: false + maven: null ndk: null novcheck: false oldsdkloc: false @@ -1367,7 +1367,7 @@ Builds: gradle: [] gradleprops: [] init: '' - maven: false + maven: null ndk: null novcheck: false oldsdkloc: false @@ -1406,7 +1406,7 @@ Builds: - VanillaARMv6fpu gradleprops: [] init: '' - maven: false + maven: null ndk: r10d novcheck: false oldsdkloc: false @@ -1446,7 +1446,7 @@ Builds: - VanillaARMv7 gradleprops: [] init: '' - maven: false + maven: null ndk: r10d novcheck: false oldsdkloc: false @@ -1486,7 +1486,7 @@ Builds: - VanillaX86 gradleprops: [] init: '' - maven: false + maven: null ndk: r10d novcheck: false oldsdkloc: false @@ -1526,7 +1526,7 @@ Builds: - VanillaARMv6fpu gradleprops: [] init: '' - maven: false + maven: null ndk: r10d novcheck: false oldsdkloc: false @@ -1566,7 +1566,7 @@ Builds: - VanillaARMv7 gradleprops: [] init: '' - maven: false + maven: null ndk: r10d novcheck: false oldsdkloc: false @@ -1606,7 +1606,7 @@ Builds: - VanillaX86 gradleprops: [] init: '' - maven: false + maven: null ndk: r10d novcheck: false oldsdkloc: false @@ -1646,7 +1646,7 @@ Builds: - VanillaARMv6fpu gradleprops: [] init: '' - maven: false + maven: null ndk: r10d novcheck: false oldsdkloc: false @@ -1686,7 +1686,7 @@ Builds: - VanillaARMv7 gradleprops: [] init: '' - maven: false + maven: null ndk: r10d novcheck: false oldsdkloc: false @@ -1726,7 +1726,7 @@ Builds: - VanillaX86 gradleprops: [] init: '' - maven: false + maven: null ndk: r10d novcheck: false oldsdkloc: false @@ -1766,7 +1766,7 @@ Builds: - VanillaARMv6fpu gradleprops: [] init: '' - maven: false + maven: null ndk: r10d novcheck: false oldsdkloc: false @@ -1806,7 +1806,7 @@ Builds: - VanillaARMv7 gradleprops: [] init: '' - maven: false + maven: null ndk: r10d novcheck: false oldsdkloc: false @@ -1846,7 +1846,7 @@ Builds: - VanillaX86 gradleprops: [] init: '' - maven: false + maven: null ndk: r10d novcheck: false oldsdkloc: false @@ -1886,7 +1886,7 @@ Builds: - VanillaARMv6fpu gradleprops: [] init: '' - maven: false + maven: null ndk: r10d novcheck: false oldsdkloc: false @@ -1926,7 +1926,7 @@ Builds: - VanillaARMv7 gradleprops: [] init: '' - maven: false + maven: null ndk: r10d novcheck: false oldsdkloc: false @@ -1966,7 +1966,7 @@ Builds: - VanillaX86 gradleprops: [] init: '' - maven: false + maven: null ndk: r10d novcheck: false oldsdkloc: false @@ -2006,7 +2006,7 @@ Builds: - VanillaARMv6fpu gradleprops: [] init: '' - maven: false + maven: null ndk: r10d novcheck: false oldsdkloc: false @@ -2046,7 +2046,7 @@ Builds: - VanillaARMv7 gradleprops: [] init: '' - maven: false + maven: null ndk: r10d novcheck: false oldsdkloc: false @@ -2086,7 +2086,7 @@ Builds: - VanillaX86 gradleprops: [] init: '' - maven: false + maven: null ndk: r10d novcheck: false oldsdkloc: false @@ -2126,7 +2126,7 @@ Builds: - VanillaARMv6fpu gradleprops: [] init: '' - maven: false + maven: null ndk: r10d novcheck: false oldsdkloc: false @@ -2166,7 +2166,7 @@ Builds: - VanillaARMv7 gradleprops: [] init: '' - maven: false + maven: null ndk: r10d novcheck: false oldsdkloc: false @@ -2206,7 +2206,7 @@ Builds: - VanillaX86 gradleprops: [] init: '' - maven: false + maven: null ndk: r10d novcheck: false oldsdkloc: false @@ -2246,7 +2246,7 @@ Builds: - VanillaARMv6fpu gradleprops: [] init: '' - maven: false + maven: null ndk: r10d novcheck: false oldsdkloc: false @@ -2286,7 +2286,7 @@ Builds: - VanillaARMv7 gradleprops: [] init: '' - maven: false + maven: null ndk: r10d novcheck: false oldsdkloc: false @@ -2326,7 +2326,7 @@ Builds: - VanillaX86 gradleprops: [] init: '' - maven: false + maven: null ndk: r10d novcheck: false oldsdkloc: false @@ -2366,7 +2366,7 @@ Builds: - VanillaARMv6fpu gradleprops: [] init: '' - maven: false + maven: null ndk: r10d novcheck: false oldsdkloc: false @@ -2406,7 +2406,7 @@ Builds: - VanillaARMv7 gradleprops: [] init: '' - maven: false + maven: null ndk: r10d novcheck: false oldsdkloc: false @@ -2446,7 +2446,7 @@ Builds: - VanillaX86 gradleprops: [] init: '' - maven: false + maven: null ndk: r10d novcheck: false oldsdkloc: false @@ -2486,7 +2486,7 @@ Builds: - VanillaARMv6fpu gradleprops: [] init: '' - maven: false + maven: null ndk: r10d novcheck: false oldsdkloc: false @@ -2526,7 +2526,7 @@ Builds: - VanillaARMv7 gradleprops: [] init: '' - maven: false + maven: null ndk: r10d novcheck: false oldsdkloc: false @@ -2566,7 +2566,7 @@ Builds: - VanillaX86 gradleprops: [] init: '' - maven: false + maven: null ndk: r10d novcheck: false oldsdkloc: false