From 6634407c60a345045743378eabf6bc6f2803530e Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Sun, 3 Feb 2019 16:52:12 +0100 Subject: [PATCH 01/16] update: allow tests to pass when apksigner is not installed This is only for the v2/v3 signatures. fdroid/fdroidserver#627 --- tests/update.TestCase | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/tests/update.TestCase b/tests/update.TestCase index 1210c78e..bce7e41c 100755 --- a/tests/update.TestCase +++ b/tests/update.TestCase @@ -408,13 +408,16 @@ class UpdateTest(unittest.TestCase): print('USE_ANDROGUARD', use_androguard) - apksigner = fdroidserver.common.find_sdk_tools_cmd('apksigner') - if use_androguard and apksigner: # v2 parsing needs both - config['apksigner'] = apksigner - apk_info = fdroidserver.update.scan_apk('v2.only.sig_2.apk') - self.assertIsNone(apk_info.get('maxSdkVersion')) - self.assertEqual(apk_info.get('versionName'), 'v2-only') - self.assertEqual(apk_info.get('versionCode'), 2) + try: + apksigner = fdroidserver.common.find_sdk_tools_cmd('apksigner') + if use_androguard and apksigner: # v2 parsing needs both + config['apksigner'] = apksigner + apk_info = fdroidserver.update.scan_apk('v2.only.sig_2.apk') + self.assertIsNone(apk_info.get('maxSdkVersion')) + self.assertEqual(apk_info.get('versionName'), 'v2-only') + self.assertEqual(apk_info.get('versionCode'), 2) + except fdroidserver.exception.FDroidException: + print('WARNING: skipping v2-only test since apksigner cannot be found') apk_info = fdroidserver.update.scan_apk('repo/v1.v2.sig_1020.apk') self.assertIsNone(apk_info.get('maxSdkVersion')) From a5851c083da68379d3c47d1d1df988e7966cac65 Mon Sep 17 00:00:00 2001 From: Nico Alt Date: Fri, 22 Mar 2019 17:15:58 +0100 Subject: [PATCH 02/16] Flush file before passing it to next function When downloading a repo index, the downloaded index got written to a file with `.write()` in a `with` clause. Before the file got actually written to the disk, it got already passed into the next function, resulting in a `VerificationException`: ``` JAR signature failed to verify: /tmp/tmppq2r51r0 jarsigner: java.util.zip.ZipException: zip file is empty ``` This behavior got introduced in 869cc114a3926fe6ffbfb55c3e8329f773c532cf. I've found this bug with help of Repomaker's tests: https://gitlab.com/fdroid/repomaker/merge_requests/215#note_148994053 --- fdroidserver/index.py | 1 + 1 file changed, 1 insertion(+) diff --git a/fdroidserver/index.py b/fdroidserver/index.py index d8477dc5..7fbbea44 100644 --- a/fdroidserver/index.py +++ b/fdroidserver/index.py @@ -717,6 +717,7 @@ def download_repo_index(url_str, etag=None, verify_fingerprint=True, timeout=600 with tempfile.NamedTemporaryFile() as fp: fp.write(download) + fp.flush() index, public_key, public_key_fingerprint = get_index_from_jar(fp.name, fingerprint) index["repo"]["pubkey"] = hexlify(public_key).decode() index["repo"]["fingerprint"] = public_key_fingerprint From bb80c729f53beffe8a6f36432022803fcf700c61 Mon Sep 17 00:00:00 2001 From: Nico Alt Date: Fri, 29 Mar 2019 08:42:49 +0100 Subject: [PATCH 03/16] Version 1.1.2, including changelog --- CHANGELOG.md | 4 ++++ setup.py | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a76b7013..e78ed677 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,8 @@ +### 1.1.2 (2019-03-29) + +* fix bug while downloading repo index ([!636](https://gitlab.com/fdroid/fdroidserver/merge_requests/636)) + ### 1.1.1 (2019-02-03) * support APK Signature v2 and v3 diff --git a/setup.py b/setup.py index 6a4aac60..c32f4449 100755 --- a/setup.py +++ b/setup.py @@ -50,7 +50,7 @@ def get_data_files(): setup(name='fdroidserver', - version='1.1.1', + version='1.1.2', description='F-Droid Server Tools', long_description='README.md', long_description_content_type='text/markdown', From 01fb62fff4c171785f63ede2d1d929a6a790a352 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Thu, 11 Apr 2019 13:30:23 +0200 Subject: [PATCH 04/16] publish: fix stupid error in repro-signing and add integration test stoopid mistake in ea84014f9b10114a0022961d86c8e43512b3ba48 --- fdroidserver/publish.py | 2 +- tests/run-tests | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/fdroidserver/publish.py b/fdroidserver/publish.py index ac9a3f44..1369d177 100644 --- a/fdroidserver/publish.py +++ b/fdroidserver/publish.py @@ -280,7 +280,7 @@ def main(): signaturefile, signedfile, manifest = signingfiles with open(signaturefile, 'rb') as f: - devfp = common.signer_fingerprint_short(common.get_signature(f.read())) + devfp = common.signer_fingerprint_short(common.get_certificate(f.read())) devsigned = '{}_{}_{}.apk'.format(appid, vercode, devfp) devsignedtmp = os.path.join(tmp_dir, devsigned) shutil.copy(apkfile, devsignedtmp) diff --git a/tests/run-tests b/tests/run-tests index 63e3b71b..63cefb94 100755 --- a/tests/run-tests +++ b/tests/run-tests @@ -1104,6 +1104,35 @@ if have_git_2_3; then fi +#------------------------------------------------------------------------------# +echo_header 'test extracting and publishing with developer signature' + +REPOROOT=`create_test_dir` +cd $REPOROOT +fdroid_init_with_prebuilt_keystore +echo "accepted_formats = ['txt']" >> config.py +echo 'keydname = "CN=Birdman, OU=Cell, O=Alcatraz, L=Alcatraz, S=California, C=US"' >> config.py +test -d metadata || mkdir metadata +cp $WORKSPACE/tests/metadata/com.politedroid.txt metadata/ +test -d repo || mkdir repo +test -d unsigned || mkdir unsigned +cp $WORKSPACE/tests/repo/com.politedroid_6.apk unsigned/ +$fdroid signatures unsigned/com.politedroid_6.apk +test -d metadata/com.politedroid/signatures/6 +test -f metadata/com.politedroid/signatures/6/MANIFEST.MF +test -f metadata/com.politedroid/signatures/6/RELEASE.RSA +test -f metadata/com.politedroid/signatures/6/RELEASE.SF +! test -f repo/com.politedroid_6.apk +$fdroid publish +test -f repo/com.politedroid_6.apk +if which jarsigner; then + jarsigner -verify repo/com.politedroid_6.apk +fi +if which apksigner; then + apksigner verify repo/com.politedroid_6.apk +fi + + #------------------------------------------------------------------------------# # remove this to prevent git conflicts and complaining From 833f23cf8965c9a24794b0d25c592c87643ced10 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Wed, 1 May 2019 13:34:02 +0200 Subject: [PATCH 05/16] scanner: allow local Debian Maven repo file:///usr/share/maven-repo It is now possible to build an app using only things in Debian. Since the buildserver will always control the contents of file:///usr/share/maven-repo, it is the most safe repo there is. --- fdroidserver/scanner.py | 1 + 1 file changed, 1 insertion(+) diff --git a/fdroidserver/scanner.py b/fdroidserver/scanner.py index 2d9e2a1d..5f315736 100644 --- a/fdroidserver/scanner.py +++ b/fdroidserver/scanner.py @@ -109,6 +109,7 @@ def scan_source(build_dir, build=metadata.Build()): 's3.amazonaws.com/repo.commonsware.com', # CommonsWare 'plugins.gradle.org/m2', # Gradle plugin repo 'maven.google.com', # Google Maven Repo, https://developer.android.com/studio/build/dependencies.html#google-maven + 'file:///usr/share/maven-repo', # local repo on Debian installs ] ] From 6e7e9b355c1a291b1535f072b5d807a8c62797fe Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Wed, 1 May 2019 13:43:24 +0200 Subject: [PATCH 06/16] deploy: if git mirror > 1GB after deleting history, delete the archive git mirrors are meant to be an easy way to host a repo that is zero maintenance. They are not meant to be the canonical repo with full, preserved archive. This option provides the zero maintenance mode. --- fdroidserver/server.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/fdroidserver/server.py b/fdroidserver/server.py index ac9cba03..ce210f84 100644 --- a/fdroidserver/server.py +++ b/fdroidserver/server.py @@ -355,6 +355,10 @@ def update_servergitmirrors(servergitmirrors, repo_section): if os.path.isdir(dotgit) and _get_size(git_mirror_path) > 1000000000: logging.warning('Deleting git-mirror history, repo is too big (1 gig max)') shutil.rmtree(dotgit) + if options.no_keep_git_mirror_archive and _get_size(git_mirror_path) > 1000000000: + logging.warning('Deleting archive, repo is too big (1 gig max)') + archive_path = os.path.join(git_mirror_path, 'fdroid', 'archive') + shutil.rmtree(archive_path, ignore_errors=True) # rsync is very particular about trailing slashes common.local_rsync(options, @@ -626,6 +630,8 @@ def main(): help=_("Specify a local folder to sync the repo to")) parser.add_argument("--no-checksum", action="store_true", default=False, help=_("Don't use rsync checksums")) + parser.add_argument("--no-keep-git-mirror-archive", action="store_true", default=False, + help=_("If a git mirror gets to big, allow the archive to be deleted")) options = parser.parse_args() config = common.read_config(options) From 5a2534b60418ba6d19a09eefdc25ee5a1765f11c Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Wed, 1 May 2019 13:49:56 +0200 Subject: [PATCH 07/16] nightly: archive older versions; remove archive if git mirror is full --- fdroidserver/nightly.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/fdroidserver/nightly.py b/fdroidserver/nightly.py index 9579ae50..d3a11db1 100644 --- a/fdroidserver/nightly.py +++ b/fdroidserver/nightly.py @@ -102,6 +102,8 @@ def main(): help=_('The file to be included in the repo (path or glob)')) parser.add_argument("--no-checksum", action="store_true", default=False, help=_("Don't use rsync checksums")) + parser.add_argument("--archive-older", default=20, + help=_("Set maximum releases in repo before older ones are archived")) # TODO add --with-btlog options = parser.parse_args() @@ -233,6 +235,7 @@ Last updated: {date}'''.format(repo_git_base=repo_git_base, config += "archive_name = '%s'\n" % (repo_git_base + ' archive') config += "archive_url = '%s'\n" % (repo_base + '/archive') config += "archive_icon = 'icon.png'\n" + config += "archive_older = %i\n" % options.archive_older config += "servergitmirrors = '%s'\n" % servergitmirror config += "keystore = '%s'\n" % KEYSTORE_FILE config += "repo_keyalias = '%s'\n" % KEY_ALIAS @@ -293,7 +296,8 @@ Last updated: {date}'''.format(repo_git_base=repo_git_base, if not options.no_deploy: try: - subprocess.check_call(['fdroid', 'server', 'update', '--verbose'], cwd=repo_basedir) + cmd = ['fdroid', 'server', 'update', '--verbose', '--no-keep-git-mirror-archive'] + subprocess.check_call(cmd, cwd=repo_basedir) except subprocess.CalledProcessError: logging.error(_('cannot publish update, did you set the deploy key?') + '\n' + deploy_key_url) From 74a0abc530ddf732dc4dc34132230aac2dd20a2e Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Thu, 2 May 2019 08:51:39 +0200 Subject: [PATCH 08/16] update bash completion for new deploy/nightly flags --- completion/bash-completion | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/completion/bash-completion b/completion/bash-completion index 531f9131..d00a767a 100644 --- a/completion/bash-completion +++ b/completion/bash-completion @@ -275,7 +275,7 @@ __complete_mirror() { __complete_nightly() { opts="-v -q" - lopts="--show-secret-var" + lopts="--show-secret-var --archive-older" __complete_options } @@ -288,7 +288,7 @@ __complete_stats() { __complete_deploy() { opts="-i -v -q" lopts="--identity-file --local-copy-dir --sync-from-local-copy-dir - --verbose --quiet --no-checksum" + --verbose --quiet --no-checksum --no-keep-git-mirror-archive" __complete_options } From 2e59220644bc25e8c73543f8ee728f327809294b Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Sun, 30 Jun 2019 22:48:52 +0200 Subject: [PATCH 09/16] gitlab-ci: disable bandit fail on standard debug keystore password --- fdroidserver/nightly.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fdroidserver/nightly.py b/fdroidserver/nightly.py index d3a11db1..7a90294d 100644 --- a/fdroidserver/nightly.py +++ b/fdroidserver/nightly.py @@ -39,7 +39,7 @@ from . import common # hard coded defaults for Android ~/.android/debug.keystore files # https://developers.google.com/android/guides/client-auth KEYSTORE_FILE = os.path.join(os.getenv('HOME'), '.android', 'debug.keystore') -PASSWORD = 'android' +PASSWORD = 'android' # nosec B105 standard hardcoded password for debug keystores KEY_ALIAS = 'androiddebugkey' DISTINGUISHED_NAME = 'CN=Android Debug,O=Android,C=US' From b484e9ecfd50ccf39822c63cbb25c287ed6d7dbd Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Mon, 1 Jul 2019 11:43:18 +0200 Subject: [PATCH 10/16] tests: handle when apksigner considers MD5 signatures valid --- tests/common.TestCase | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/tests/common.TestCase b/tests/common.TestCase index b976376f..0bfb166b 100755 --- a/tests/common.TestCase +++ b/tests/common.TestCase @@ -340,10 +340,16 @@ class CommonTest(unittest.TestCase): fdroidserver.common.config = config self.assertTrue(fdroidserver.common.verify_apk_signature('bad-unicode-πÇÇ现代通用字-български-عربي1.apk')) - self.assertFalse(fdroidserver.common.verify_apk_signature('org.bitbucket.tickytacky.mirrormirror_1.apk')) - self.assertFalse(fdroidserver.common.verify_apk_signature('org.bitbucket.tickytacky.mirrormirror_2.apk')) - self.assertFalse(fdroidserver.common.verify_apk_signature('org.bitbucket.tickytacky.mirrormirror_3.apk')) - self.assertFalse(fdroidserver.common.verify_apk_signature('org.bitbucket.tickytacky.mirrormirror_4.apk')) + if 'apksigner' in fdroidserver.common.config: # apksigner considers MD5 signatures valid + self.assertTrue(fdroidserver.common.verify_apk_signature('org.bitbucket.tickytacky.mirrormirror_1.apk')) + self.assertTrue(fdroidserver.common.verify_apk_signature('org.bitbucket.tickytacky.mirrormirror_2.apk')) + self.assertTrue(fdroidserver.common.verify_apk_signature('org.bitbucket.tickytacky.mirrormirror_3.apk')) + self.assertTrue(fdroidserver.common.verify_apk_signature('org.bitbucket.tickytacky.mirrormirror_4.apk')) + else: + self.assertFalse(fdroidserver.common.verify_apk_signature('org.bitbucket.tickytacky.mirrormirror_1.apk')) + self.assertFalse(fdroidserver.common.verify_apk_signature('org.bitbucket.tickytacky.mirrormirror_2.apk')) + self.assertFalse(fdroidserver.common.verify_apk_signature('org.bitbucket.tickytacky.mirrormirror_3.apk')) + self.assertFalse(fdroidserver.common.verify_apk_signature('org.bitbucket.tickytacky.mirrormirror_4.apk')) self.assertTrue(fdroidserver.common.verify_apk_signature('org.dyndns.fules.ck_20.apk')) self.assertTrue(fdroidserver.common.verify_apk_signature('urzip.apk')) self.assertFalse(fdroidserver.common.verify_apk_signature('urzip-badcert.apk')) From 9e32e2d770ad6993104ac5da09f06a0d093d8dea Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Mon, 1 Jul 2019 22:07:15 +0200 Subject: [PATCH 11/16] tests: common.test_sign_apk requires aapt to run --- tests/common.TestCase | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/common.TestCase b/tests/common.TestCase index 0bfb166b..5defdac5 100755 --- a/tests/common.TestCase +++ b/tests/common.TestCase @@ -569,6 +569,7 @@ class CommonTest(unittest.TestCase): def test_sign_apk(self): try: + fdroidserver.common.find_sdk_tools_cmd('aapt') fdroidserver.common.find_sdk_tools_cmd('zipalign') except fdroidserver.exception.FDroidException: print('\n\nSKIPPING test_sign_apk, zipalign is not installed!\n') From 4ddd840471814b7afbfca99be775482eb646ca77 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Wed, 3 Jul 2019 19:39:52 +0200 Subject: [PATCH 12/16] tests: only run hooks/pre-commit if its present (not in source tarball) --- tests/run-tests | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/run-tests b/tests/run-tests index 63cefb94..353005e1 100755 --- a/tests/run-tests +++ b/tests/run-tests @@ -128,7 +128,7 @@ set -x # show each command as it is executed echo_header "run commit hooks" cd $WORKSPACE -./hooks/pre-commit +test -x ./hooks/pre-commit && ./hooks/pre-commit #------------------------------------------------------------------------------# From 5ba741912815b55b8e1a1068facf4d9a89f929fd Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Wed, 3 Jul 2019 22:33:01 +0200 Subject: [PATCH 13/16] tests: only run source tarball test if running from git clone --- tests/run-tests | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/tests/run-tests b/tests/run-tests index 353005e1..742a1cfc 100755 --- a/tests/run-tests +++ b/tests/run-tests @@ -636,19 +636,21 @@ $fdroid install || true #------------------------------------------------------------------------------# -echo_header "create a source tarball" +# only run this test if running from a git repo, not all files are in the tarball +if [ -e .git/config ]; then + echo_header "create a source tarball" -cd $WORKSPACE -./setup.py compile_catalog sdist - -REPOROOT=`create_test_dir` -cd $REPOROOT -tar xzf `ls -1 $WORKSPACE/dist/fdroidserver-*.tar.gz | sort -n | tail -1` -cd $REPOROOT -./fdroidserver-*/fdroid init -copy_apks_into_repo $REPOROOT -./fdroidserver-*/fdroid update --create-metadata --verbose + cd $WORKSPACE + ./setup.py compile_catalog sdist + REPOROOT=`create_test_dir` + cd $REPOROOT + tar xzf `ls -1 $WORKSPACE/dist/fdroidserver-*.tar.gz | sort -n | tail -1` + cd $REPOROOT + ./fdroidserver-*/fdroid init + copy_apks_into_repo $REPOROOT + ./fdroidserver-*/fdroid update --create-metadata --verbose +fi #------------------------------------------------------------------------------# echo_header "test config checks of local_copy_dir" From e8cd0986e357da37832743a51518157bc051a11d Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Wed, 3 Jul 2019 18:54:52 +0200 Subject: [PATCH 14/16] include all relevant files in source tarball (MANIFEST.in) --- MANIFEST.in | 550 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 548 insertions(+), 2 deletions(-) diff --git a/MANIFEST.in b/MANIFEST.in index ba173c91..8be4dabf 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -4,9 +4,9 @@ include buildserver/provision-android-sdk include buildserver/provision-apt-get-install include buildserver/provision-apt-proxy include buildserver/provision-gradle -include buildserver/provision-pip include buildserver/setup-env-vars include buildserver/Vagrantfile +include CHANGELOG.md include completion/bash-completion include docker/Dockerfile include docker/drozer.py @@ -41,15 +41,513 @@ include locale/uk/LC_MESSAGES/fdroidserver.mo include locale/zh_Hans/LC_MESSAGES/fdroidserver.mo include locale/zh_Hant/LC_MESSAGES/fdroidserver.mo include makebuildserver -include README.rst +include README.md include tests/androguard_test.py include tests/bad-unicode-*.apk include tests/build.TestCase +include tests/build-tools/17.0.0/aapt-output-com.moez.QKSMS_182.txt +include tests/build-tools/17.0.0/aapt-output-com.politedroid_3.txt +include tests/build-tools/17.0.0/aapt-output-com.politedroid_4.txt +include tests/build-tools/17.0.0/aapt-output-com.politedroid_5.txt +include tests/build-tools/17.0.0/aapt-output-com.politedroid_6.txt +include tests/build-tools/17.0.0/aapt-output-duplicate.permisssions_9999999.txt +include tests/build-tools/17.0.0/aapt-output-info.guardianproject.urzip_100.txt +include tests/build-tools/17.0.0/aapt-output-info.zwanenburg.caffeinetile_4.txt +include tests/build-tools/17.0.0/aapt-output-obb.main.oldversion_1444412523.txt +include tests/build-tools/17.0.0/aapt-output-obb.mainpatch.current_1619.txt +include tests/build-tools/17.0.0/aapt-output-obb.main.twoversions_1101613.txt +include tests/build-tools/17.0.0/aapt-output-obb.main.twoversions_1101615.txt +include tests/build-tools/17.0.0/aapt-output-obb.main.twoversions_1101617.txt +include tests/build-tools/17.0.0/aapt-output-org.droidtr.keyboard_34.txt +include tests/build-tools/17.0.0/aapt-output-souch.smsbypass_9.txt +include tests/build-tools/18.1.1/aapt-output-com.moez.QKSMS_182.txt +include tests/build-tools/18.1.1/aapt-output-com.politedroid_3.txt +include tests/build-tools/18.1.1/aapt-output-com.politedroid_4.txt +include tests/build-tools/18.1.1/aapt-output-com.politedroid_5.txt +include tests/build-tools/18.1.1/aapt-output-com.politedroid_6.txt +include tests/build-tools/18.1.1/aapt-output-duplicate.permisssions_9999999.txt +include tests/build-tools/18.1.1/aapt-output-info.guardianproject.urzip_100.txt +include tests/build-tools/18.1.1/aapt-output-info.zwanenburg.caffeinetile_4.txt +include tests/build-tools/18.1.1/aapt-output-obb.main.oldversion_1444412523.txt +include tests/build-tools/18.1.1/aapt-output-obb.mainpatch.current_1619.txt +include tests/build-tools/18.1.1/aapt-output-obb.main.twoversions_1101613.txt +include tests/build-tools/18.1.1/aapt-output-obb.main.twoversions_1101615.txt +include tests/build-tools/18.1.1/aapt-output-obb.main.twoversions_1101617.txt +include tests/build-tools/18.1.1/aapt-output-org.droidtr.keyboard_34.txt +include tests/build-tools/18.1.1/aapt-output-souch.smsbypass_9.txt +include tests/build-tools/19.0.0/aapt-output-com.moez.QKSMS_182.txt +include tests/build-tools/19.0.0/aapt-output-com.politedroid_3.txt +include tests/build-tools/19.0.0/aapt-output-com.politedroid_4.txt +include tests/build-tools/19.0.0/aapt-output-com.politedroid_5.txt +include tests/build-tools/19.0.0/aapt-output-com.politedroid_6.txt +include tests/build-tools/19.0.0/aapt-output-duplicate.permisssions_9999999.txt +include tests/build-tools/19.0.0/aapt-output-info.guardianproject.urzip_100.txt +include tests/build-tools/19.0.0/aapt-output-info.zwanenburg.caffeinetile_4.txt +include tests/build-tools/19.0.0/aapt-output-obb.main.oldversion_1444412523.txt +include tests/build-tools/19.0.0/aapt-output-obb.mainpatch.current_1619.txt +include tests/build-tools/19.0.0/aapt-output-obb.main.twoversions_1101613.txt +include tests/build-tools/19.0.0/aapt-output-obb.main.twoversions_1101615.txt +include tests/build-tools/19.0.0/aapt-output-obb.main.twoversions_1101617.txt +include tests/build-tools/19.0.0/aapt-output-org.droidtr.keyboard_34.txt +include tests/build-tools/19.0.0/aapt-output-souch.smsbypass_9.txt +include tests/build-tools/19.1.0/aapt-output-com.moez.QKSMS_182.txt +include tests/build-tools/19.1.0/aapt-output-com.politedroid_3.txt +include tests/build-tools/19.1.0/aapt-output-com.politedroid_4.txt +include tests/build-tools/19.1.0/aapt-output-com.politedroid_5.txt +include tests/build-tools/19.1.0/aapt-output-com.politedroid_6.txt +include tests/build-tools/19.1.0/aapt-output-duplicate.permisssions_9999999.txt +include tests/build-tools/19.1.0/aapt-output-info.guardianproject.urzip_100.txt +include tests/build-tools/19.1.0/aapt-output-info.zwanenburg.caffeinetile_4.txt +include tests/build-tools/19.1.0/aapt-output-obb.main.oldversion_1444412523.txt +include tests/build-tools/19.1.0/aapt-output-obb.mainpatch.current_1619.txt +include tests/build-tools/19.1.0/aapt-output-obb.main.twoversions_1101613.txt +include tests/build-tools/19.1.0/aapt-output-obb.main.twoversions_1101615.txt +include tests/build-tools/19.1.0/aapt-output-obb.main.twoversions_1101617.txt +include tests/build-tools/19.1.0/aapt-output-org.droidtr.keyboard_34.txt +include tests/build-tools/19.1.0/aapt-output-souch.smsbypass_9.txt +include tests/build-tools/20.0.0/aapt-output-com.moez.QKSMS_182.txt +include tests/build-tools/20.0.0/aapt-output-com.politedroid_3.txt +include tests/build-tools/20.0.0/aapt-output-com.politedroid_4.txt +include tests/build-tools/20.0.0/aapt-output-com.politedroid_5.txt +include tests/build-tools/20.0.0/aapt-output-com.politedroid_6.txt +include tests/build-tools/20.0.0/aapt-output-duplicate.permisssions_9999999.txt +include tests/build-tools/20.0.0/aapt-output-info.guardianproject.urzip_100.txt +include tests/build-tools/20.0.0/aapt-output-info.zwanenburg.caffeinetile_4.txt +include tests/build-tools/20.0.0/aapt-output-obb.main.oldversion_1444412523.txt +include tests/build-tools/20.0.0/aapt-output-obb.mainpatch.current_1619.txt +include tests/build-tools/20.0.0/aapt-output-obb.main.twoversions_1101613.txt +include tests/build-tools/20.0.0/aapt-output-obb.main.twoversions_1101615.txt +include tests/build-tools/20.0.0/aapt-output-obb.main.twoversions_1101617.txt +include tests/build-tools/20.0.0/aapt-output-org.droidtr.keyboard_34.txt +include tests/build-tools/20.0.0/aapt-output-souch.smsbypass_9.txt +include tests/build-tools/21.1.1/aapt-output-com.moez.QKSMS_182.txt +include tests/build-tools/21.1.1/aapt-output-com.politedroid_3.txt +include tests/build-tools/21.1.1/aapt-output-com.politedroid_4.txt +include tests/build-tools/21.1.1/aapt-output-com.politedroid_5.txt +include tests/build-tools/21.1.1/aapt-output-com.politedroid_6.txt +include tests/build-tools/21.1.1/aapt-output-duplicate.permisssions_9999999.txt +include tests/build-tools/21.1.1/aapt-output-info.guardianproject.urzip_100.txt +include tests/build-tools/21.1.1/aapt-output-info.zwanenburg.caffeinetile_4.txt +include tests/build-tools/21.1.1/aapt-output-obb.main.oldversion_1444412523.txt +include tests/build-tools/21.1.1/aapt-output-obb.mainpatch.current_1619.txt +include tests/build-tools/21.1.1/aapt-output-obb.main.twoversions_1101613.txt +include tests/build-tools/21.1.1/aapt-output-obb.main.twoversions_1101615.txt +include tests/build-tools/21.1.1/aapt-output-obb.main.twoversions_1101617.txt +include tests/build-tools/21.1.1/aapt-output-org.droidtr.keyboard_34.txt +include tests/build-tools/21.1.1/aapt-output-souch.smsbypass_9.txt +include tests/build-tools/21.1.2/aapt-output-com.moez.QKSMS_182.txt +include tests/build-tools/21.1.2/aapt-output-com.politedroid_3.txt +include tests/build-tools/21.1.2/aapt-output-com.politedroid_4.txt +include tests/build-tools/21.1.2/aapt-output-com.politedroid_5.txt +include tests/build-tools/21.1.2/aapt-output-com.politedroid_6.txt +include tests/build-tools/21.1.2/aapt-output-duplicate.permisssions_9999999.txt +include tests/build-tools/21.1.2/aapt-output-info.guardianproject.urzip_100.txt +include tests/build-tools/21.1.2/aapt-output-info.zwanenburg.caffeinetile_4.txt +include tests/build-tools/21.1.2/aapt-output-obb.main.oldversion_1444412523.txt +include tests/build-tools/21.1.2/aapt-output-obb.mainpatch.current_1619.txt +include tests/build-tools/21.1.2/aapt-output-obb.main.twoversions_1101613.txt +include tests/build-tools/21.1.2/aapt-output-obb.main.twoversions_1101615.txt +include tests/build-tools/21.1.2/aapt-output-obb.main.twoversions_1101617.txt +include tests/build-tools/21.1.2/aapt-output-org.droidtr.keyboard_34.txt +include tests/build-tools/21.1.2/aapt-output-souch.smsbypass_9.txt +include tests/build-tools/22.0.0/aapt-output-com.moez.QKSMS_182.txt +include tests/build-tools/22.0.0/aapt-output-com.politedroid_3.txt +include tests/build-tools/22.0.0/aapt-output-com.politedroid_4.txt +include tests/build-tools/22.0.0/aapt-output-com.politedroid_5.txt +include tests/build-tools/22.0.0/aapt-output-com.politedroid_6.txt +include tests/build-tools/22.0.0/aapt-output-duplicate.permisssions_9999999.txt +include tests/build-tools/22.0.0/aapt-output-info.guardianproject.urzip_100.txt +include tests/build-tools/22.0.0/aapt-output-info.zwanenburg.caffeinetile_4.txt +include tests/build-tools/22.0.0/aapt-output-obb.main.oldversion_1444412523.txt +include tests/build-tools/22.0.0/aapt-output-obb.mainpatch.current_1619.txt +include tests/build-tools/22.0.0/aapt-output-obb.main.twoversions_1101613.txt +include tests/build-tools/22.0.0/aapt-output-obb.main.twoversions_1101615.txt +include tests/build-tools/22.0.0/aapt-output-obb.main.twoversions_1101617.txt +include tests/build-tools/22.0.0/aapt-output-org.droidtr.keyboard_34.txt +include tests/build-tools/22.0.0/aapt-output-souch.smsbypass_9.txt +include tests/build-tools/22.0.1/aapt-output-com.moez.QKSMS_182.txt +include tests/build-tools/22.0.1/aapt-output-com.politedroid_3.txt +include tests/build-tools/22.0.1/aapt-output-com.politedroid_4.txt +include tests/build-tools/22.0.1/aapt-output-com.politedroid_5.txt +include tests/build-tools/22.0.1/aapt-output-com.politedroid_6.txt +include tests/build-tools/22.0.1/aapt-output-duplicate.permisssions_9999999.txt +include tests/build-tools/22.0.1/aapt-output-info.guardianproject.urzip_100.txt +include tests/build-tools/22.0.1/aapt-output-info.zwanenburg.caffeinetile_4.txt +include tests/build-tools/22.0.1/aapt-output-obb.main.oldversion_1444412523.txt +include tests/build-tools/22.0.1/aapt-output-obb.mainpatch.current_1619.txt +include tests/build-tools/22.0.1/aapt-output-obb.main.twoversions_1101613.txt +include tests/build-tools/22.0.1/aapt-output-obb.main.twoversions_1101615.txt +include tests/build-tools/22.0.1/aapt-output-obb.main.twoversions_1101617.txt +include tests/build-tools/22.0.1/aapt-output-org.droidtr.keyboard_34.txt +include tests/build-tools/22.0.1/aapt-output-souch.smsbypass_9.txt +include tests/build-tools/23.0.0/aapt-output-com.moez.QKSMS_182.txt +include tests/build-tools/23.0.0/aapt-output-com.politedroid_3.txt +include tests/build-tools/23.0.0/aapt-output-com.politedroid_4.txt +include tests/build-tools/23.0.0/aapt-output-com.politedroid_5.txt +include tests/build-tools/23.0.0/aapt-output-com.politedroid_6.txt +include tests/build-tools/23.0.0/aapt-output-duplicate.permisssions_9999999.txt +include tests/build-tools/23.0.0/aapt-output-info.guardianproject.urzip_100.txt +include tests/build-tools/23.0.0/aapt-output-info.zwanenburg.caffeinetile_4.txt +include tests/build-tools/23.0.0/aapt-output-obb.main.oldversion_1444412523.txt +include tests/build-tools/23.0.0/aapt-output-obb.mainpatch.current_1619.txt +include tests/build-tools/23.0.0/aapt-output-obb.main.twoversions_1101613.txt +include tests/build-tools/23.0.0/aapt-output-obb.main.twoversions_1101615.txt +include tests/build-tools/23.0.0/aapt-output-obb.main.twoversions_1101617.txt +include tests/build-tools/23.0.0/aapt-output-org.droidtr.keyboard_34.txt +include tests/build-tools/23.0.0/aapt-output-souch.smsbypass_9.txt +include tests/build-tools/23.0.1/aapt-output-com.moez.QKSMS_182.txt +include tests/build-tools/23.0.1/aapt-output-com.politedroid_3.txt +include tests/build-tools/23.0.1/aapt-output-com.politedroid_4.txt +include tests/build-tools/23.0.1/aapt-output-com.politedroid_5.txt +include tests/build-tools/23.0.1/aapt-output-com.politedroid_6.txt +include tests/build-tools/23.0.1/aapt-output-duplicate.permisssions_9999999.txt +include tests/build-tools/23.0.1/aapt-output-info.guardianproject.urzip_100.txt +include tests/build-tools/23.0.1/aapt-output-info.zwanenburg.caffeinetile_4.txt +include tests/build-tools/23.0.1/aapt-output-obb.main.oldversion_1444412523.txt +include tests/build-tools/23.0.1/aapt-output-obb.mainpatch.current_1619.txt +include tests/build-tools/23.0.1/aapt-output-obb.main.twoversions_1101613.txt +include tests/build-tools/23.0.1/aapt-output-obb.main.twoversions_1101615.txt +include tests/build-tools/23.0.1/aapt-output-obb.main.twoversions_1101617.txt +include tests/build-tools/23.0.1/aapt-output-org.droidtr.keyboard_34.txt +include tests/build-tools/23.0.1/aapt-output-souch.smsbypass_9.txt +include tests/build-tools/23.0.2/aapt-output-com.moez.QKSMS_182.txt +include tests/build-tools/23.0.2/aapt-output-com.politedroid_3.txt +include tests/build-tools/23.0.2/aapt-output-com.politedroid_4.txt +include tests/build-tools/23.0.2/aapt-output-com.politedroid_5.txt +include tests/build-tools/23.0.2/aapt-output-com.politedroid_6.txt +include tests/build-tools/23.0.2/aapt-output-duplicate.permisssions_9999999.txt +include tests/build-tools/23.0.2/aapt-output-info.guardianproject.urzip_100.txt +include tests/build-tools/23.0.2/aapt-output-info.zwanenburg.caffeinetile_4.txt +include tests/build-tools/23.0.2/aapt-output-obb.main.oldversion_1444412523.txt +include tests/build-tools/23.0.2/aapt-output-obb.mainpatch.current_1619.txt +include tests/build-tools/23.0.2/aapt-output-obb.main.twoversions_1101613.txt +include tests/build-tools/23.0.2/aapt-output-obb.main.twoversions_1101615.txt +include tests/build-tools/23.0.2/aapt-output-obb.main.twoversions_1101617.txt +include tests/build-tools/23.0.2/aapt-output-org.droidtr.keyboard_34.txt +include tests/build-tools/23.0.2/aapt-output-souch.smsbypass_9.txt +include tests/build-tools/23.0.3/aapt-output-com.moez.QKSMS_182.txt +include tests/build-tools/23.0.3/aapt-output-com.politedroid_3.txt +include tests/build-tools/23.0.3/aapt-output-com.politedroid_4.txt +include tests/build-tools/23.0.3/aapt-output-com.politedroid_5.txt +include tests/build-tools/23.0.3/aapt-output-com.politedroid_6.txt +include tests/build-tools/23.0.3/aapt-output-duplicate.permisssions_9999999.txt +include tests/build-tools/23.0.3/aapt-output-info.guardianproject.urzip_100.txt +include tests/build-tools/23.0.3/aapt-output-info.zwanenburg.caffeinetile_4.txt +include tests/build-tools/23.0.3/aapt-output-obb.main.oldversion_1444412523.txt +include tests/build-tools/23.0.3/aapt-output-obb.mainpatch.current_1619.txt +include tests/build-tools/23.0.3/aapt-output-obb.main.twoversions_1101613.txt +include tests/build-tools/23.0.3/aapt-output-obb.main.twoversions_1101615.txt +include tests/build-tools/23.0.3/aapt-output-obb.main.twoversions_1101617.txt +include tests/build-tools/23.0.3/aapt-output-org.droidtr.keyboard_34.txt +include tests/build-tools/23.0.3/aapt-output-souch.smsbypass_9.txt +include tests/build-tools/24.0.0/aapt-output-com.moez.QKSMS_182.txt +include tests/build-tools/24.0.0/aapt-output-com.politedroid_3.txt +include tests/build-tools/24.0.0/aapt-output-com.politedroid_4.txt +include tests/build-tools/24.0.0/aapt-output-com.politedroid_5.txt +include tests/build-tools/24.0.0/aapt-output-com.politedroid_6.txt +include tests/build-tools/24.0.0/aapt-output-duplicate.permisssions_9999999.txt +include tests/build-tools/24.0.0/aapt-output-info.guardianproject.urzip_100.txt +include tests/build-tools/24.0.0/aapt-output-info.zwanenburg.caffeinetile_4.txt +include tests/build-tools/24.0.0/aapt-output-obb.main.oldversion_1444412523.txt +include tests/build-tools/24.0.0/aapt-output-obb.mainpatch.current_1619.txt +include tests/build-tools/24.0.0/aapt-output-obb.main.twoversions_1101613.txt +include tests/build-tools/24.0.0/aapt-output-obb.main.twoversions_1101615.txt +include tests/build-tools/24.0.0/aapt-output-obb.main.twoversions_1101617.txt +include tests/build-tools/24.0.0/aapt-output-org.droidtr.keyboard_34.txt +include tests/build-tools/24.0.0/aapt-output-souch.smsbypass_9.txt +include tests/build-tools/24.0.1/aapt-output-com.moez.QKSMS_182.txt +include tests/build-tools/24.0.1/aapt-output-com.politedroid_3.txt +include tests/build-tools/24.0.1/aapt-output-com.politedroid_4.txt +include tests/build-tools/24.0.1/aapt-output-com.politedroid_5.txt +include tests/build-tools/24.0.1/aapt-output-com.politedroid_6.txt +include tests/build-tools/24.0.1/aapt-output-duplicate.permisssions_9999999.txt +include tests/build-tools/24.0.1/aapt-output-info.guardianproject.urzip_100.txt +include tests/build-tools/24.0.1/aapt-output-info.zwanenburg.caffeinetile_4.txt +include tests/build-tools/24.0.1/aapt-output-obb.main.oldversion_1444412523.txt +include tests/build-tools/24.0.1/aapt-output-obb.mainpatch.current_1619.txt +include tests/build-tools/24.0.1/aapt-output-obb.main.twoversions_1101613.txt +include tests/build-tools/24.0.1/aapt-output-obb.main.twoversions_1101615.txt +include tests/build-tools/24.0.1/aapt-output-obb.main.twoversions_1101617.txt +include tests/build-tools/24.0.1/aapt-output-org.droidtr.keyboard_34.txt +include tests/build-tools/24.0.1/aapt-output-souch.smsbypass_9.txt +include tests/build-tools/24.0.2/aapt-output-com.moez.QKSMS_182.txt +include tests/build-tools/24.0.2/aapt-output-com.politedroid_3.txt +include tests/build-tools/24.0.2/aapt-output-com.politedroid_4.txt +include tests/build-tools/24.0.2/aapt-output-com.politedroid_5.txt +include tests/build-tools/24.0.2/aapt-output-com.politedroid_6.txt +include tests/build-tools/24.0.2/aapt-output-duplicate.permisssions_9999999.txt +include tests/build-tools/24.0.2/aapt-output-info.guardianproject.urzip_100.txt +include tests/build-tools/24.0.2/aapt-output-info.zwanenburg.caffeinetile_4.txt +include tests/build-tools/24.0.2/aapt-output-obb.main.oldversion_1444412523.txt +include tests/build-tools/24.0.2/aapt-output-obb.mainpatch.current_1619.txt +include tests/build-tools/24.0.2/aapt-output-obb.main.twoversions_1101613.txt +include tests/build-tools/24.0.2/aapt-output-obb.main.twoversions_1101615.txt +include tests/build-tools/24.0.2/aapt-output-obb.main.twoversions_1101617.txt +include tests/build-tools/24.0.2/aapt-output-org.droidtr.keyboard_34.txt +include tests/build-tools/24.0.2/aapt-output-souch.smsbypass_9.txt +include tests/build-tools/24.0.3/aapt-output-com.moez.QKSMS_182.txt +include tests/build-tools/24.0.3/aapt-output-com.politedroid_3.txt +include tests/build-tools/24.0.3/aapt-output-com.politedroid_4.txt +include tests/build-tools/24.0.3/aapt-output-com.politedroid_5.txt +include tests/build-tools/24.0.3/aapt-output-com.politedroid_6.txt +include tests/build-tools/24.0.3/aapt-output-duplicate.permisssions_9999999.txt +include tests/build-tools/24.0.3/aapt-output-info.guardianproject.urzip_100.txt +include tests/build-tools/24.0.3/aapt-output-info.zwanenburg.caffeinetile_4.txt +include tests/build-tools/24.0.3/aapt-output-obb.main.oldversion_1444412523.txt +include tests/build-tools/24.0.3/aapt-output-obb.mainpatch.current_1619.txt +include tests/build-tools/24.0.3/aapt-output-obb.main.twoversions_1101613.txt +include tests/build-tools/24.0.3/aapt-output-obb.main.twoversions_1101615.txt +include tests/build-tools/24.0.3/aapt-output-obb.main.twoversions_1101617.txt +include tests/build-tools/24.0.3/aapt-output-org.droidtr.keyboard_34.txt +include tests/build-tools/24.0.3/aapt-output-souch.smsbypass_9.txt +include tests/build-tools/25.0.0/aapt-output-com.moez.QKSMS_182.txt +include tests/build-tools/25.0.0/aapt-output-com.politedroid_3.txt +include tests/build-tools/25.0.0/aapt-output-com.politedroid_4.txt +include tests/build-tools/25.0.0/aapt-output-com.politedroid_5.txt +include tests/build-tools/25.0.0/aapt-output-com.politedroid_6.txt +include tests/build-tools/25.0.0/aapt-output-duplicate.permisssions_9999999.txt +include tests/build-tools/25.0.0/aapt-output-info.guardianproject.urzip_100.txt +include tests/build-tools/25.0.0/aapt-output-info.zwanenburg.caffeinetile_4.txt +include tests/build-tools/25.0.0/aapt-output-obb.main.oldversion_1444412523.txt +include tests/build-tools/25.0.0/aapt-output-obb.mainpatch.current_1619.txt +include tests/build-tools/25.0.0/aapt-output-obb.main.twoversions_1101613.txt +include tests/build-tools/25.0.0/aapt-output-obb.main.twoversions_1101615.txt +include tests/build-tools/25.0.0/aapt-output-obb.main.twoversions_1101617.txt +include tests/build-tools/25.0.0/aapt-output-org.droidtr.keyboard_34.txt +include tests/build-tools/25.0.0/aapt-output-souch.smsbypass_9.txt +include tests/build-tools/25.0.1/aapt-output-com.moez.QKSMS_182.txt +include tests/build-tools/25.0.1/aapt-output-com.politedroid_3.txt +include tests/build-tools/25.0.1/aapt-output-com.politedroid_4.txt +include tests/build-tools/25.0.1/aapt-output-com.politedroid_5.txt +include tests/build-tools/25.0.1/aapt-output-com.politedroid_6.txt +include tests/build-tools/25.0.1/aapt-output-duplicate.permisssions_9999999.txt +include tests/build-tools/25.0.1/aapt-output-info.guardianproject.urzip_100.txt +include tests/build-tools/25.0.1/aapt-output-info.zwanenburg.caffeinetile_4.txt +include tests/build-tools/25.0.1/aapt-output-obb.main.oldversion_1444412523.txt +include tests/build-tools/25.0.1/aapt-output-obb.mainpatch.current_1619.txt +include tests/build-tools/25.0.1/aapt-output-obb.main.twoversions_1101613.txt +include tests/build-tools/25.0.1/aapt-output-obb.main.twoversions_1101615.txt +include tests/build-tools/25.0.1/aapt-output-obb.main.twoversions_1101617.txt +include tests/build-tools/25.0.1/aapt-output-org.droidtr.keyboard_34.txt +include tests/build-tools/25.0.1/aapt-output-souch.smsbypass_9.txt +include tests/build-tools/25.0.2/aapt-output-com.moez.QKSMS_182.txt +include tests/build-tools/25.0.2/aapt-output-com.politedroid_3.txt +include tests/build-tools/25.0.2/aapt-output-com.politedroid_4.txt +include tests/build-tools/25.0.2/aapt-output-com.politedroid_5.txt +include tests/build-tools/25.0.2/aapt-output-com.politedroid_6.txt +include tests/build-tools/25.0.2/aapt-output-duplicate.permisssions_9999999.txt +include tests/build-tools/25.0.2/aapt-output-info.guardianproject.urzip_100.txt +include tests/build-tools/25.0.2/aapt-output-info.zwanenburg.caffeinetile_4.txt +include tests/build-tools/25.0.2/aapt-output-obb.main.oldversion_1444412523.txt +include tests/build-tools/25.0.2/aapt-output-obb.mainpatch.current_1619.txt +include tests/build-tools/25.0.2/aapt-output-obb.main.twoversions_1101613.txt +include tests/build-tools/25.0.2/aapt-output-obb.main.twoversions_1101615.txt +include tests/build-tools/25.0.2/aapt-output-obb.main.twoversions_1101617.txt +include tests/build-tools/25.0.2/aapt-output-org.droidtr.keyboard_34.txt +include tests/build-tools/25.0.2/aapt-output-souch.smsbypass_9.txt +include tests/build-tools/25.0.3/aapt-output-com.moez.QKSMS_182.txt +include tests/build-tools/25.0.3/aapt-output-com.politedroid_3.txt +include tests/build-tools/25.0.3/aapt-output-com.politedroid_4.txt +include tests/build-tools/25.0.3/aapt-output-com.politedroid_5.txt +include tests/build-tools/25.0.3/aapt-output-com.politedroid_6.txt +include tests/build-tools/25.0.3/aapt-output-duplicate.permisssions_9999999.txt +include tests/build-tools/25.0.3/aapt-output-info.guardianproject.urzip_100.txt +include tests/build-tools/25.0.3/aapt-output-info.zwanenburg.caffeinetile_4.txt +include tests/build-tools/25.0.3/aapt-output-obb.main.oldversion_1444412523.txt +include tests/build-tools/25.0.3/aapt-output-obb.mainpatch.current_1619.txt +include tests/build-tools/25.0.3/aapt-output-obb.main.twoversions_1101613.txt +include tests/build-tools/25.0.3/aapt-output-obb.main.twoversions_1101615.txt +include tests/build-tools/25.0.3/aapt-output-obb.main.twoversions_1101617.txt +include tests/build-tools/25.0.3/aapt-output-org.droidtr.keyboard_34.txt +include tests/build-tools/25.0.3/aapt-output-souch.smsbypass_9.txt +include tests/build-tools/26.0.0/aapt-output-com.moez.QKSMS_182.txt +include tests/build-tools/26.0.0/aapt-output-com.politedroid_3.txt +include tests/build-tools/26.0.0/aapt-output-com.politedroid_4.txt +include tests/build-tools/26.0.0/aapt-output-com.politedroid_5.txt +include tests/build-tools/26.0.0/aapt-output-com.politedroid_6.txt +include tests/build-tools/26.0.0/aapt-output-duplicate.permisssions_9999999.txt +include tests/build-tools/26.0.0/aapt-output-info.guardianproject.urzip_100.txt +include tests/build-tools/26.0.0/aapt-output-info.zwanenburg.caffeinetile_4.txt +include tests/build-tools/26.0.0/aapt-output-obb.main.oldversion_1444412523.txt +include tests/build-tools/26.0.0/aapt-output-obb.mainpatch.current_1619.txt +include tests/build-tools/26.0.0/aapt-output-obb.main.twoversions_1101613.txt +include tests/build-tools/26.0.0/aapt-output-obb.main.twoversions_1101615.txt +include tests/build-tools/26.0.0/aapt-output-obb.main.twoversions_1101617.txt +include tests/build-tools/26.0.0/aapt-output-org.droidtr.keyboard_34.txt +include tests/build-tools/26.0.0/aapt-output-souch.smsbypass_9.txt +include tests/build-tools/26.0.1/aapt-output-com.moez.QKSMS_182.txt +include tests/build-tools/26.0.1/aapt-output-com.politedroid_3.txt +include tests/build-tools/26.0.1/aapt-output-com.politedroid_4.txt +include tests/build-tools/26.0.1/aapt-output-com.politedroid_5.txt +include tests/build-tools/26.0.1/aapt-output-com.politedroid_6.txt +include tests/build-tools/26.0.1/aapt-output-duplicate.permisssions_9999999.txt +include tests/build-tools/26.0.1/aapt-output-info.guardianproject.urzip_100.txt +include tests/build-tools/26.0.1/aapt-output-info.zwanenburg.caffeinetile_4.txt +include tests/build-tools/26.0.1/aapt-output-obb.main.oldversion_1444412523.txt +include tests/build-tools/26.0.1/aapt-output-obb.mainpatch.current_1619.txt +include tests/build-tools/26.0.1/aapt-output-obb.main.twoversions_1101613.txt +include tests/build-tools/26.0.1/aapt-output-obb.main.twoversions_1101615.txt +include tests/build-tools/26.0.1/aapt-output-obb.main.twoversions_1101617.txt +include tests/build-tools/26.0.1/aapt-output-org.droidtr.keyboard_34.txt +include tests/build-tools/26.0.1/aapt-output-souch.smsbypass_9.txt +include tests/build-tools/26.0.2/aapt-output-com.moez.QKSMS_182.txt +include tests/build-tools/26.0.2/aapt-output-com.politedroid_3.txt +include tests/build-tools/26.0.2/aapt-output-com.politedroid_4.txt +include tests/build-tools/26.0.2/aapt-output-com.politedroid_5.txt +include tests/build-tools/26.0.2/aapt-output-com.politedroid_6.txt +include tests/build-tools/26.0.2/aapt-output-duplicate.permisssions_9999999.txt +include tests/build-tools/26.0.2/aapt-output-info.guardianproject.urzip_100.txt +include tests/build-tools/26.0.2/aapt-output-info.zwanenburg.caffeinetile_4.txt +include tests/build-tools/26.0.2/aapt-output-obb.main.oldversion_1444412523.txt +include tests/build-tools/26.0.2/aapt-output-obb.mainpatch.current_1619.txt +include tests/build-tools/26.0.2/aapt-output-obb.main.twoversions_1101613.txt +include tests/build-tools/26.0.2/aapt-output-obb.main.twoversions_1101615.txt +include tests/build-tools/26.0.2/aapt-output-obb.main.twoversions_1101617.txt +include tests/build-tools/26.0.2/aapt-output-org.droidtr.keyboard_34.txt +include tests/build-tools/26.0.2/aapt-output-souch.smsbypass_9.txt +include tests/build-tools/26.0.3/aapt-output-com.moez.QKSMS_182.txt +include tests/build-tools/26.0.3/aapt-output-com.politedroid_3.txt +include tests/build-tools/26.0.3/aapt-output-com.politedroid_4.txt +include tests/build-tools/26.0.3/aapt-output-com.politedroid_5.txt +include tests/build-tools/26.0.3/aapt-output-com.politedroid_6.txt +include tests/build-tools/26.0.3/aapt-output-duplicate.permisssions_9999999.txt +include tests/build-tools/26.0.3/aapt-output-info.guardianproject.urzip_100.txt +include tests/build-tools/26.0.3/aapt-output-info.zwanenburg.caffeinetile_4.txt +include tests/build-tools/26.0.3/aapt-output-obb.main.oldversion_1444412523.txt +include tests/build-tools/26.0.3/aapt-output-obb.mainpatch.current_1619.txt +include tests/build-tools/26.0.3/aapt-output-obb.main.twoversions_1101613.txt +include tests/build-tools/26.0.3/aapt-output-obb.main.twoversions_1101615.txt +include tests/build-tools/26.0.3/aapt-output-obb.main.twoversions_1101617.txt +include tests/build-tools/26.0.3/aapt-output-org.droidtr.keyboard_34.txt +include tests/build-tools/26.0.3/aapt-output-souch.smsbypass_9.txt +include tests/build-tools/27.0.0/aapt-output-com.moez.QKSMS_182.txt +include tests/build-tools/27.0.0/aapt-output-com.politedroid_3.txt +include tests/build-tools/27.0.0/aapt-output-com.politedroid_4.txt +include tests/build-tools/27.0.0/aapt-output-com.politedroid_5.txt +include tests/build-tools/27.0.0/aapt-output-com.politedroid_6.txt +include tests/build-tools/27.0.0/aapt-output-duplicate.permisssions_9999999.txt +include tests/build-tools/27.0.0/aapt-output-info.guardianproject.urzip_100.txt +include tests/build-tools/27.0.0/aapt-output-info.zwanenburg.caffeinetile_4.txt +include tests/build-tools/27.0.0/aapt-output-obb.main.oldversion_1444412523.txt +include tests/build-tools/27.0.0/aapt-output-obb.mainpatch.current_1619.txt +include tests/build-tools/27.0.0/aapt-output-obb.main.twoversions_1101613.txt +include tests/build-tools/27.0.0/aapt-output-obb.main.twoversions_1101615.txt +include tests/build-tools/27.0.0/aapt-output-obb.main.twoversions_1101617.txt +include tests/build-tools/27.0.0/aapt-output-org.droidtr.keyboard_34.txt +include tests/build-tools/27.0.0/aapt-output-souch.smsbypass_9.txt +include tests/build-tools/27.0.1/aapt-output-com.moez.QKSMS_182.txt +include tests/build-tools/27.0.1/aapt-output-com.politedroid_3.txt +include tests/build-tools/27.0.1/aapt-output-com.politedroid_4.txt +include tests/build-tools/27.0.1/aapt-output-com.politedroid_5.txt +include tests/build-tools/27.0.1/aapt-output-com.politedroid_6.txt +include tests/build-tools/27.0.1/aapt-output-duplicate.permisssions_9999999.txt +include tests/build-tools/27.0.1/aapt-output-info.guardianproject.urzip_100.txt +include tests/build-tools/27.0.1/aapt-output-info.zwanenburg.caffeinetile_4.txt +include tests/build-tools/27.0.1/aapt-output-obb.main.oldversion_1444412523.txt +include tests/build-tools/27.0.1/aapt-output-obb.mainpatch.current_1619.txt +include tests/build-tools/27.0.1/aapt-output-obb.main.twoversions_1101613.txt +include tests/build-tools/27.0.1/aapt-output-obb.main.twoversions_1101615.txt +include tests/build-tools/27.0.1/aapt-output-obb.main.twoversions_1101617.txt +include tests/build-tools/27.0.1/aapt-output-org.droidtr.keyboard_34.txt +include tests/build-tools/27.0.1/aapt-output-souch.smsbypass_9.txt +include tests/build-tools/27.0.2/aapt-output-com.moez.QKSMS_182.txt +include tests/build-tools/27.0.2/aapt-output-com.politedroid_3.txt +include tests/build-tools/27.0.2/aapt-output-com.politedroid_4.txt +include tests/build-tools/27.0.2/aapt-output-com.politedroid_5.txt +include tests/build-tools/27.0.2/aapt-output-com.politedroid_6.txt +include tests/build-tools/27.0.2/aapt-output-duplicate.permisssions_9999999.txt +include tests/build-tools/27.0.2/aapt-output-info.guardianproject.urzip_100.txt +include tests/build-tools/27.0.2/aapt-output-info.zwanenburg.caffeinetile_4.txt +include tests/build-tools/27.0.2/aapt-output-obb.main.oldversion_1444412523.txt +include tests/build-tools/27.0.2/aapt-output-obb.mainpatch.current_1619.txt +include tests/build-tools/27.0.2/aapt-output-obb.main.twoversions_1101613.txt +include tests/build-tools/27.0.2/aapt-output-obb.main.twoversions_1101615.txt +include tests/build-tools/27.0.2/aapt-output-obb.main.twoversions_1101617.txt +include tests/build-tools/27.0.2/aapt-output-org.droidtr.keyboard_34.txt +include tests/build-tools/27.0.2/aapt-output-souch.smsbypass_9.txt +include tests/build-tools/27.0.3/aapt-output-com.moez.QKSMS_182.txt +include tests/build-tools/27.0.3/aapt-output-com.politedroid_3.txt +include tests/build-tools/27.0.3/aapt-output-com.politedroid_4.txt +include tests/build-tools/27.0.3/aapt-output-com.politedroid_5.txt +include tests/build-tools/27.0.3/aapt-output-com.politedroid_6.txt +include tests/build-tools/27.0.3/aapt-output-duplicate.permisssions_9999999.txt +include tests/build-tools/27.0.3/aapt-output-info.guardianproject.urzip_100.txt +include tests/build-tools/27.0.3/aapt-output-info.zwanenburg.caffeinetile_4.txt +include tests/build-tools/27.0.3/aapt-output-obb.main.oldversion_1444412523.txt +include tests/build-tools/27.0.3/aapt-output-obb.mainpatch.current_1619.txt +include tests/build-tools/27.0.3/aapt-output-obb.main.twoversions_1101613.txt +include tests/build-tools/27.0.3/aapt-output-obb.main.twoversions_1101615.txt +include tests/build-tools/27.0.3/aapt-output-obb.main.twoversions_1101617.txt +include tests/build-tools/27.0.3/aapt-output-org.droidtr.keyboard_34.txt +include tests/build-tools/27.0.3/aapt-output-souch.smsbypass_9.txt +include tests/build-tools/28.0.0/aapt-output-com.moez.QKSMS_182.txt +include tests/build-tools/28.0.0/aapt-output-com.politedroid_3.txt +include tests/build-tools/28.0.0/aapt-output-com.politedroid_4.txt +include tests/build-tools/28.0.0/aapt-output-com.politedroid_5.txt +include tests/build-tools/28.0.0/aapt-output-com.politedroid_6.txt +include tests/build-tools/28.0.0/aapt-output-duplicate.permisssions_9999999.txt +include tests/build-tools/28.0.0/aapt-output-info.guardianproject.urzip_100.txt +include tests/build-tools/28.0.0/aapt-output-info.zwanenburg.caffeinetile_4.txt +include tests/build-tools/28.0.0/aapt-output-obb.main.oldversion_1444412523.txt +include tests/build-tools/28.0.0/aapt-output-obb.mainpatch.current_1619.txt +include tests/build-tools/28.0.0/aapt-output-obb.main.twoversions_1101613.txt +include tests/build-tools/28.0.0/aapt-output-obb.main.twoversions_1101615.txt +include tests/build-tools/28.0.0/aapt-output-obb.main.twoversions_1101617.txt +include tests/build-tools/28.0.0/aapt-output-org.droidtr.keyboard_34.txt +include tests/build-tools/28.0.0/aapt-output-souch.smsbypass_9.txt +include tests/build-tools/28.0.1/aapt-output-com.moez.QKSMS_182.txt +include tests/build-tools/28.0.1/aapt-output-com.politedroid_3.txt +include tests/build-tools/28.0.1/aapt-output-com.politedroid_4.txt +include tests/build-tools/28.0.1/aapt-output-com.politedroid_5.txt +include tests/build-tools/28.0.1/aapt-output-com.politedroid_6.txt +include tests/build-tools/28.0.1/aapt-output-duplicate.permisssions_9999999.txt +include tests/build-tools/28.0.1/aapt-output-info.guardianproject.urzip_100.txt +include tests/build-tools/28.0.1/aapt-output-info.zwanenburg.caffeinetile_4.txt +include tests/build-tools/28.0.1/aapt-output-obb.main.oldversion_1444412523.txt +include tests/build-tools/28.0.1/aapt-output-obb.mainpatch.current_1619.txt +include tests/build-tools/28.0.1/aapt-output-obb.main.twoversions_1101613.txt +include tests/build-tools/28.0.1/aapt-output-obb.main.twoversions_1101615.txt +include tests/build-tools/28.0.1/aapt-output-obb.main.twoversions_1101617.txt +include tests/build-tools/28.0.1/aapt-output-org.droidtr.keyboard_34.txt +include tests/build-tools/28.0.1/aapt-output-souch.smsbypass_9.txt +include tests/build-tools/28.0.2/aapt-output-com.politedroid_3.txt +include tests/build-tools/28.0.2/aapt-output-com.politedroid_4.txt +include tests/build-tools/28.0.2/aapt-output-com.politedroid_5.txt +include tests/build-tools/28.0.2/aapt-output-com.politedroid_6.txt +include tests/build-tools/28.0.2/aapt-output-duplicate.permisssions_9999999.txt +include tests/build-tools/28.0.2/aapt-output-info.guardianproject.urzip_100.txt +include tests/build-tools/28.0.2/aapt-output-info.zwanenburg.caffeinetile_4.txt +include tests/build-tools/28.0.2/aapt-output-obb.main.oldversion_1444412523.txt +include tests/build-tools/28.0.2/aapt-output-obb.mainpatch.current_1619.txt +include tests/build-tools/28.0.2/aapt-output-obb.main.twoversions_1101613.txt +include tests/build-tools/28.0.2/aapt-output-obb.main.twoversions_1101615.txt +include tests/build-tools/28.0.2/aapt-output-obb.main.twoversions_1101617.txt +include tests/build-tools/28.0.2/aapt-output-org.droidtr.keyboard_34.txt +include tests/build-tools/28.0.2/aapt-output-souch.smsbypass_9.txt +include tests/build-tools/28.0.3/aapt-output-com.example.test.helloworld_1.txt +include tests/build-tools/28.0.3/aapt-output-com.politedroid_3.txt +include tests/build-tools/28.0.3/aapt-output-com.politedroid_4.txt +include tests/build-tools/28.0.3/aapt-output-com.politedroid_5.txt +include tests/build-tools/28.0.3/aapt-output-com.politedroid_6.txt +include tests/build-tools/28.0.3/aapt-output-duplicate.permisssions_9999999.txt +include tests/build-tools/28.0.3/aapt-output-info.guardianproject.urzip_100.txt +include tests/build-tools/28.0.3/aapt-output-info.zwanenburg.caffeinetile_4.txt +include tests/build-tools/28.0.3/aapt-output-no.min.target.sdk_987.txt +include tests/build-tools/28.0.3/aapt-output-obb.main.oldversion_1444412523.txt +include tests/build-tools/28.0.3/aapt-output-obb.mainpatch.current_1619.txt +include tests/build-tools/28.0.3/aapt-output-obb.main.twoversions_1101613.txt +include tests/build-tools/28.0.3/aapt-output-obb.main.twoversions_1101615.txt +include tests/build-tools/28.0.3/aapt-output-obb.main.twoversions_1101617.txt +include tests/build-tools/28.0.3/aapt-output-souch.smsbypass_9.txt +include tests/build-tools/generate.sh +include tests/check-fdroid-apk include tests/common.TestCase include tests/complete-ci-tests include tests/config.py include tests/description-parsing.py +include tests/dummy-keystore.jks include tests/dump_internal_metadata_format.py +include tests/exception.TestCase include tests/extra/convert_metadata_to_yaml_then_txt.sh include tests/extra/manual-vmtools-test.py include tests/getsig/getsig.java @@ -63,6 +561,8 @@ include tests/import_proxy.py include tests/import.TestCase include tests/index.TestCase include tests/install.TestCase +include tests/IsMD5Disabled.java +include tests/janus.apk include tests/keystore.jks include tests/lint.TestCase include tests/metadata/apk/info.guardianproject.urzip.yaml @@ -73,6 +573,7 @@ include tests/metadata/dump/com.politedroid.yaml include tests/metadata/dump/org.adaway.yaml include tests/metadata/dump/org.smssecure.smssecure.yaml include tests/metadata/dump/org.videolan.vlc.yaml +include tests/metadata/duplicate.permisssions.yml include tests/metadata/fake.ota.update.txt include tests/metadata/info.guardianproject.checkey/en-US/description.txt include tests/metadata/info.guardianproject.checkey/en-US/phoneScreenshots/checkey-phone.png @@ -87,18 +588,27 @@ include tests/metadata/info.guardianproject.urzip/en-US/short_description.txt include tests/metadata/info.guardianproject.urzip/en-US/title.txt include tests/metadata/info.guardianproject.urzip/en-US/video.txt include tests/metadata/info.guardianproject.urzip.yml +include tests/metadata/info.zwanenburg.caffeinetile.yml +include tests/metadata/no.min.target.sdk.yml include tests/metadata/obb.main.oldversion.txt include tests/metadata/obb.mainpatch.current.txt include tests/metadata/obb.main.twoversions.txt include tests/metadata/org.adaway.json include tests/metadata/org.fdroid.ci.test.app.txt include tests/metadata/org.fdroid.fdroid.txt +include tests/metadata/org.smssecure.smssecure/signatures/134/28969C09.RSA +include tests/metadata/org.smssecure.smssecure/signatures/134/28969C09.SF +include tests/metadata/org.smssecure.smssecure/signatures/134/MANIFEST.MF +include tests/metadata/org.smssecure.smssecure/signatures/135/28969C09.RSA +include tests/metadata/org.smssecure.smssecure/signatures/135/28969C09.SF +include tests/metadata/org.smssecure.smssecure/signatures/135/MANIFEST.MF include tests/metadata/org.smssecure.smssecure.txt include tests/metadata/org.videolan.vlc.yml include tests/metadata/raw.template.txt include tests/metadata-rewrite-yml/app.with.special.build.params.yml include tests/metadata-rewrite-yml/fake.ota.update.yml include tests/metadata-rewrite-yml/org.fdroid.fdroid.yml +include tests/metadata/souch.smsbypass.txt include tests/metadata.TestCase include tests/openssl-version-check-test.py include tests/org.bitbucket.tickytacky.mirrormirror_1.apk @@ -106,17 +616,23 @@ include tests/org.bitbucket.tickytacky.mirrormirror_2.apk include tests/org.bitbucket.tickytacky.mirrormirror_3.apk include tests/org.bitbucket.tickytacky.mirrormirror_4.apk include tests/org.dyndns.fules.ck_20.apk +include tests/publish.TestCase include tests/repo/categories.txt +include tests/repo/com.example.test.helloworld_1.apk include tests/repo/com.politedroid_3.apk include tests/repo/com.politedroid_4.apk include tests/repo/com.politedroid_5.apk include tests/repo/com.politedroid_6.apk +include tests/repo/duplicate.permisssions_9999999.apk include tests/repo/fake.ota.update_1234.zip +include tests/repo/index-v1.json include tests/repo/index.xml +include tests/repo/info.zwanenburg.caffeinetile_4.apk include tests/repo/main.1101613.obb.main.twoversions.obb include tests/repo/main.1101615.obb.main.twoversions.obb include tests/repo/main.1434483388.obb.main.oldversion.obb include tests/repo/main.1619.obb.mainpatch.current.obb +include tests/repo/no.min.target.sdk_987.apk include tests/repo/obb.main.oldversion_1444412523.apk include tests/repo/obb.mainpatch.current_1619_another-release-key.apk include tests/repo/obb.mainpatch.current_1619.apk @@ -154,19 +670,45 @@ include tests/repo/org.videolan.vlc/en-US/sevenInchScreenshots/screenshot5.png include tests/repo/org.videolan.vlc/en-US/sevenInchScreenshots/screenshot6.png include tests/repo/org.videolan.vlc/en-US/sevenInchScreenshots/screenshot8.png include tests/repo/patch.1619.obb.mainpatch.current.obb +include tests/repo/souch.smsbypass_9.apk include tests/repo/urzip-*.apk +include tests/repo/v1.v2.sig_1020.apk include tests/run-tests +include tests/scanner.TestCase +include tests/server.TestCase include tests/signatures.TestCase include tests/signindex/guardianproject.jar include tests/signindex/guardianproject-v1.jar include tests/signindex/testy.jar include tests/signindex/unsigned.jar +include tests/source-files/at.bitfire.davdroid/build.gradle +include tests/source-files/com.kunzisoft.testcase/build.gradle +include tests/source-files/com.nextcloud.client/build.gradle +include tests/source-files/com.nextcloud.client.dev/src/generic/fastlane/metadata/android/en-US/full_description.txt +include tests/source-files/com.nextcloud.client.dev/src/generic/fastlane/metadata/android/en-US/short_description.txt +include tests/source-files/com.nextcloud.client.dev/src/generic/fastlane/metadata/android/en-US/title.txt +include tests/source-files/com.nextcloud.client.dev/src/versionDev/fastlane/metadata/android/en-US/full_description.txt +include tests/source-files/com.nextcloud.client.dev/src/versionDev/fastlane/metadata/android/en-US/short_description.txt +include tests/source-files/com.nextcloud.client.dev/src/versionDev/fastlane/metadata/android/en-US/title.txt +include tests/source-files/com.nextcloud.client/src/generic/fastlane/metadata/android/en-US/full_description.txt +include tests/source-files/com.nextcloud.client/src/generic/fastlane/metadata/android/en-US/short_description.txt +include tests/source-files/com.nextcloud.client/src/generic/fastlane/metadata/android/en-US/title.txt +include tests/source-files/com.nextcloud.client/src/versionDev/fastlane/metadata/android/en-US/full_description.txt +include tests/source-files/com.nextcloud.client/src/versionDev/fastlane/metadata/android/en-US/short_description.txt +include tests/source-files/com.nextcloud.client/src/versionDev/fastlane/metadata/android/en-US/title.txt +include tests/source-files/eu.siacs.conversations/build.gradle +include tests/source-files/eu.siacs.conversations/metadata/en-US/name.txt include tests/source-files/fdroid/fdroidclient/AndroidManifest.xml include tests/source-files/fdroid/fdroidclient/build.gradle +include tests/source-files/firebase-suspect/app/build.gradle +include tests/source-files/firebase-suspect/build.gradle +include tests/source-files/firebase-whitelisted/app/build.gradle +include tests/source-files/firebase-whitelisted/build.gradle include tests/source-files/open-keychain/open-keychain/build.gradle include tests/source-files/open-keychain/open-keychain/OpenKeychain/build.gradle include tests/source-files/osmandapp/osmand/build.gradle include tests/source-files/Zillode/syncthing-silk/build.gradle +include tests/SpeedoMeterApp.main_1.apk include tests/stats/known_apks.txt include tests/testcommon.py include tests/update.TestCase @@ -175,3 +717,7 @@ include tests/urzip-badcert.apk include tests/urzip-badsig.apk include tests/urzip-release.apk include tests/urzip-release-unsigned.apk +include tests/v2.only.sig_2.apk +include tests/valid-package-names/random-package-names +include tests/valid-package-names/RandomPackageNames.java +include tests/valid-package-names/test.py From fd1e22e79140be3b614932b82398b9e034d0ef76 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Wed, 3 Jul 2019 16:20:15 +0200 Subject: [PATCH 15/16] ./setup.py release: make upload step manual so CI can run first There is lots of CI tests for the Debian package, so it is good to first run those Debian CI tests before uploading an fdroidserver release. --- setup.cfg | 4 ++-- setup.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/setup.cfg b/setup.cfg index ed171a15..d4887223 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,8 +1,8 @@ # uploading here requires Python 3.5.3+ or setuptools 27+, -# use instead: twine upload dist/fdroidserver*.tar.gz* +# use instead: twine upload --sign dist/fdroidserver*.tar.gz [aliases] -release = versioncheck compile_catalog register sdist upload --sign +release = versioncheck compile_catalog sdist # All this below is for Babel config. Ideally we would only use # Babel, but it is still missing some key features that gettext gives diff --git a/setup.py b/setup.py index c32f4449..43c9be25 100755 --- a/setup.py +++ b/setup.py @@ -25,7 +25,7 @@ class VersionCheckCommand(Command): print('ERROR: Release version mismatch! setup.py (%s) does not match git (%s)' % (version, version_git)) sys.exit(1) - print('Upload using: twine upload dist/fdroidserver*.tar.gz*') + print('Upload using: twine upload --sign dist/fdroidserver-%s.tar.gz' % version) def get_data_files(): From fd870c59bd7514bac1a3641d2f2e818467109730 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Wed, 3 Jul 2019 19:02:12 +0200 Subject: [PATCH 16/16] bump to version v1.1.3 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 43c9be25..14a0607b 100755 --- a/setup.py +++ b/setup.py @@ -50,7 +50,7 @@ def get_data_files(): setup(name='fdroidserver', - version='1.1.2', + version='1.1.3', description='F-Droid Server Tools', long_description='README.md', long_description_content_type='text/markdown',