chiark / gitweb /
fdroidserver.git
6 years agoMerge branch 'build-drozer-syntax-error' into 'master'
Hans-Christoph Steiner [Tue, 26 Sep 2017 08:49:51 +0000 (08:49 +0000)]
Merge branch 'build-drozer-syntax-error' into 'master'

building with --dscanner now exits gracefully when repo dir not present

See merge request fdroid/fdroidserver!344

6 years agotests: test setting up app git repo like `fdroid build` does
Hans-Christoph Steiner [Mon, 25 Sep 2017 14:34:25 +0000 (16:34 +0200)]
tests: test setting up app git repo like `fdroid build` does

I wrote this to try to find #379 but this test didn't trigger that bug.

6 years agotests: add setUp() method to common to handle standard stuff
Hans-Christoph Steiner [Mon, 25 Sep 2017 14:28:22 +0000 (16:28 +0200)]
tests: add setUp() method to common to handle standard stuff

6 years agomove lots of comments to function doc strings
Hans-Christoph Steiner [Wed, 20 Sep 2017 15:22:56 +0000 (17:22 +0200)]
move lots of comments to function doc strings

6 years agotravis-ci: quiet output for pip/sdkmanager installs
Hans-Christoph Steiner [Wed, 20 Sep 2017 13:54:50 +0000 (15:54 +0200)]
travis-ci: quiet output for pip/sdkmanager installs

The log was getting way too long.

6 years agoupdate MANIFEST.in
Hans-Christoph Steiner [Wed, 20 Sep 2017 10:23:41 +0000 (12:23 +0200)]
update MANIFEST.in

There were a number of new files missing.  Some files still manually
excluded.  Generated using:

 for f in `git ls-tree -r master --name-only | sort`; do echo include $f; done

6 years agouse pandoc to convert README.md to PyPI's reST format
Hans-Christoph Steiner [Wed, 20 Sep 2017 09:48:49 +0000 (11:48 +0200)]
use pandoc to convert README.md to PyPI's reST format

PyPI and Python packages expect the description to be in reST format, which
is a lot different than Markdown.  This does the conversion if pandoc is
installed.

6 years agobuild+drozer: error message instead of crash when repo-folder missing
Michael Pöhn [Mon, 25 Sep 2017 14:09:57 +0000 (16:09 +0200)]
build+drozer: error message instead of crash when repo-folder missing

6 years agoMerge branch 'gradle-4.2' into 'master'
Hans-Christoph Steiner [Mon, 25 Sep 2017 12:17:34 +0000 (12:17 +0000)]
Merge branch 'gradle-4.2' into 'master'

makebuildserver: add Gradle 4.2

See merge request fdroid/fdroidserver!342

6 years agomakebuildserver: add Gradle 4.2
relan [Sat, 23 Sep 2017 07:04:39 +0000 (10:04 +0300)]
makebuildserver: add Gradle 4.2

6 years agoMerge branch 'port-to-osx-and-trusty' into 'master'
Hans-Christoph Steiner [Wed, 20 Sep 2017 15:24:57 +0000 (15:24 +0000)]
Merge branch 'port-to-osx-and-trusty' into 'master'

port to OSX and Ubuntu/trusty

See merge request fdroid/fdroidserver!341

6 years agotravis-ci: always reinstall Java on OSX to get recent version
Hans-Christoph Steiner [Tue, 19 Sep 2017 18:10:25 +0000 (20:10 +0200)]
travis-ci: always reinstall Java on OSX to get recent version

The Travis images have quite old versions of Java currently.

6 years agotravis-ci: test on older OSX versions
Hans-Christoph Steiner [Sun, 17 Sep 2017 10:54:43 +0000 (12:54 +0200)]
travis-ci: test on older OSX versions

6 years agotests: use ci-test-app with current Gradle Android Plugin
Hans-Christoph Steiner [Tue, 19 Sep 2017 14:41:50 +0000 (16:41 +0200)]
tests: use ci-test-app with current Gradle Android Plugin

This works around the gradle 2.x bug where versions newer than 2.9 cannot
run things.  This also then specifies the version of Gradle Android Plugin
that is included in Debian/stretch.

6 years agotests: support Java setups where MD5 is not disabled by default
Hans-Christoph Steiner [Tue, 19 Sep 2017 18:01:15 +0000 (20:01 +0200)]
tests: support Java setups where MD5 is not disabled by default

For platforms using Java < 1.8.0_133, MD5 is still enabled for JAR
signatures.  Its just too painful to manage all this, so support this
in the tests.

6 years agotests: don't run gpgsign tests on Travis CI's OSX, gpg always fails
Hans-Christoph Steiner [Thu, 14 Sep 2017 12:34:29 +0000 (14:34 +0200)]
tests: don't run gpgsign tests on Travis CI's OSX, gpg always fails

6 years agotravis-ci: make Trusty builds a first class citizen
Hans-Christoph Steiner [Tue, 19 Sep 2017 17:58:45 +0000 (19:58 +0200)]
travis-ci: make Trusty builds a first class citizen

Trusty is used in Travis-CI, Windows Subsystem for Linux, and many other
places, so its an important target platform to test on.  This provides
testing for the backports in the Launchpad PPAs like:

* https://launchpad.net/~fdroid/+archive/ubuntu/fdroidserver
* https://launchpad.net/~fdroid/+archive/ubuntu/buildserver

6 years agotravis-ci: update OSX CI build to work again
Hans-Christoph Steiner [Tue, 19 Sep 2017 17:58:31 +0000 (19:58 +0200)]
travis-ci: update OSX CI build to work again

6 years agotests: support Ubuntu/trusty's python3.4-venv
Hans-Christoph Steiner [Fri, 15 Sep 2017 21:25:07 +0000 (23:25 +0200)]
tests: support Ubuntu/trusty's python3.4-venv

6 years agotests: prefer GNU sed on BSD/OSX, BSD's sed has lame syntax
Hans-Christoph Steiner [Sat, 16 Sep 2017 08:03:17 +0000 (10:03 +0200)]
tests: prefer GNU sed on BSD/OSX, BSD's sed has lame syntax

https://blog.remibergsma.com/2012/09/18/sed-inline-editing-different-on-mac-osx/

6 years agoallow spaces in filenames
Hans-Christoph Steiner [Tue, 19 Sep 2017 08:57:29 +0000 (10:57 +0200)]
allow spaces in filenames

This fixes all the bugs I could find that prevented fdroid from
handling files with spaces in them.  This is more important now that
fdroid supports random media files, and Repomaker

6 years agotests: move test APK with bad unicode filename to separate test
Hans-Christoph Steiner [Tue, 19 Sep 2017 14:48:20 +0000 (16:48 +0200)]
tests: move test APK with bad unicode filename to separate test

This filename has some messed up bytes related to bi-directional script
that is included (Left-to-Right and Right-to-Left).  GNU/Linux always
interprets filenames as pure byte sequences.  Windows and OSX store
filenames as Unicode strings.  So on OSX, the invalid filename gets
converted to a valid name.  That works fine, but the test fails because it
is compared to a file generated on Ubuntu, where it preserves the byte
sequence.

This includes an APK with a valid Unicode filename that includes
bi-directional script.

6 years agoindex: always use jarsigner for verifying JAR signatures
Hans-Christoph Steiner [Tue, 19 Sep 2017 13:07:19 +0000 (15:07 +0200)]
index: always use jarsigner for verifying JAR signatures

apksigner v0.7 (build-tools 26.0.1), Google made it require that the
AndroidManifest.xml was present in the archive before it verifies the
signature.  So this needs to stick with the jarsigner hack for JARs.

6 years agoinit: prompt user for Android SDK path using platform-specific default
Hans-Christoph Steiner [Tue, 19 Sep 2017 08:55:16 +0000 (10:55 +0200)]
init: prompt user for Android SDK path using platform-specific default

6 years agocreate blank config.py using cross-platform technique
Hans-Christoph Steiner [Sun, 17 Sep 2017 19:54:21 +0000 (21:54 +0200)]
create blank config.py using cross-platform technique

os.mknod() fails on OSX with:

Traceback (most recent call last):

  File "/Users/travis/build/fdroidtravis/fdroidserver/tests/../fdroid", line 154, in <module>
    main()
  File "/Users/travis/build/fdroidtravis/fdroidserver/tests/../fdroid", line 130, in main
    mod.main()
  File "/Users/travis/build/fdroidtravis/fdroidserver/fdroidserver/update.py", line 1768, in main
    common.write_to_config(config, 'repo_keyalias', config['repo_keyalias'])
  File "/Users/travis/build/fdroidtravis/fdroidserver/fdroidserver/common.py", line 2328, in write_to_config
    os.mknod(cfg)
PermissionError: [Errno 1] Operation not permitted

6 years agoMerge branch 'first-working-localization' into 'master'
Hans-Christoph Steiner [Tue, 19 Sep 2017 18:12:41 +0000 (18:12 +0000)]
Merge branch 'first-working-localization' into 'master'

First working localization

See merge request fdroid/fdroidserver!340

6 years agoupdate translation template with latest strings
Hans-Christoph Steiner [Fri, 15 Sep 2017 21:40:11 +0000 (23:40 +0200)]
update translation template with latest strings

6 years agoadd Makefile to handle refreshing translation template
Hans-Christoph Steiner [Fri, 15 Sep 2017 21:39:32 +0000 (23:39 +0200)]
add Makefile to handle refreshing translation template

To generate the translation files, run `make -C locale`or
`cd locale && make`

To update the template, run `make -C locale template` or
`cd locale && make fdroidserver.pot`

6 years agofix string formats that are ambiguous for translators
Hans-Christoph Steiner [Fri, 15 Sep 2017 21:20:29 +0000 (23:20 +0200)]
fix string formats that are ambiguous for translators

6 years agoensure _ is used only for gettext strings
Hans-Christoph Steiner [Fri, 15 Sep 2017 19:48:45 +0000 (21:48 +0200)]
ensure _ is used only for gettext strings

_ is often used for variables that are ignored, this makes that a bit more
explicit
!338

6 years agoEnglish source string corrections
Hans-Christoph Steiner [Fri, 15 Sep 2017 20:20:18 +0000 (22:20 +0200)]
English source string corrections

From @monolifed <monolifed@gmail.com>

6 years ago"No config.py found" should warning level, until people get use to it
Hans-Christoph Steiner [Sat, 16 Sep 2017 08:41:12 +0000 (10:41 +0200)]
"No config.py found" should warning level, until people get use to it

Since !335 changed the long standing behavior, now allowing `fdroid` to
work without a config.py being present, this message should be quite
visible in case people are expecting `fdroid` to fail when there is no
config.py present.

6 years agoMerge branch 'plural' into 'master'
Hans-Christoph Steiner [Sat, 16 Sep 2017 08:11:06 +0000 (08:11 +0000)]
Merge branch 'plural' into 'master'

Correct plurals

See merge request fdroid/fdroidserver!334

6 years agoMerge branch 'newcomers' into 'master'
Hans-Christoph Steiner [Sat, 16 Sep 2017 08:07:56 +0000 (08:07 +0000)]
Merge branch 'newcomers' into 'master'

allow starting without config.py

See merge request fdroid/fdroidserver!335

6 years agoMerge branch 'weblate' into 'master'
Hans-Christoph Steiner [Fri, 15 Sep 2017 21:00:33 +0000 (21:00 +0000)]
Merge branch 'weblate' into 'master'

Weblate

See merge request fdroid/fdroidserver!339

6 years agoWeblate
Hans-Christoph Steiner [Fri, 15 Sep 2017 21:00:33 +0000 (21:00 +0000)]
Weblate

6 years agoMerge branch 'implement-gettext' into 'master'
Hans-Christoph Steiner [Fri, 15 Sep 2017 19:29:12 +0000 (19:29 +0000)]
Merge branch 'implement-gettext' into 'master'

first implementation of localization using gettext

Closes #342

See merge request fdroid/fdroidserver!338

6 years agoCorrect plurals
Jan Berkel [Wed, 13 Sep 2017 15:33:57 +0000 (17:33 +0200)]
Correct plurals

6 years agorename 'app-id' to standard Android 'applicationId'
Hans-Christoph Steiner [Fri, 15 Sep 2017 09:41:39 +0000 (11:41 +0200)]
rename 'app-id' to standard Android 'applicationId'

* https://developer.android.com/studio/build/application-id.html
* https://sites.google.com/a/android.com/tools/tech-docs/new-build-system/applicationid-vs-packagename

This only changes the term in the human texts, not var names or CLI flags.

6 years agoimplement gettext localization
Hans-Christoph Steiner [Wed, 13 Sep 2017 16:03:57 +0000 (18:03 +0200)]
implement gettext localization

This allows all the text to be localized via Weblate.  This is a quick
overview of all the strings, but there are certainly some that were left
out.

closes #342

6 years agotests: support running on platforms with old java
Hans-Christoph Steiner [Wed, 13 Sep 2017 14:00:51 +0000 (16:00 +0200)]
tests: support running on platforms with old java

In order to test on travis-ci's OSX setup, its easiest to support the old
version of Java that is installed there by default.  It is pretty old, so
it does not include the April 2017 update that disables MD5:

https://blogs.oracle.com/java-platform-group/oracle-jre-will-no-longer-trust-md5-signed-code-by-default
https://www.bleepingcomputer.com/news/security/oracle-to-block-jar-files-signed-with-md5-starting-with-april-2017
https://support.ca.com/us/knowledge-base-articles.TEC1691042.html

#292 #323

6 years agostandardize os.walk() var names based on Python 3.5 docs
Hans-Christoph Steiner [Thu, 14 Sep 2017 06:44:43 +0000 (08:44 +0200)]
standardize os.walk() var names based on Python 3.5 docs

There were multiple conventions used in the code, but mostly it was already
using the convention from the docs, so this converts things to using that
convention:

https://docs.python.org/3/library/os.html#os.walk

6 years agoset minimum Python version to 3.4
Hans-Christoph Steiner [Fri, 15 Sep 2017 09:31:18 +0000 (11:31 +0200)]
set minimum Python version to 3.4

We use contructs introduced in 3.4, and 3.4 is really widely available.

https://setuptools.readthedocs.io/en/latest/setuptools.html#new-and-changed-setup-keywords

6 years agogitlab-ci: ensure release tag is present for metadata_v0 tests
Hans-Christoph Steiner [Thu, 14 Sep 2017 08:22:37 +0000 (10:22 +0200)]
gitlab-ci: ensure release tag is present for metadata_v0 tests

Forks won't necessarily have all the tags, so this ensures that they are
present.

6 years agoMerge branch 'buildserver-verbose' into 'master'
Hans-Christoph Steiner [Fri, 15 Sep 2017 09:10:07 +0000 (09:10 +0000)]
Merge branch 'buildserver-verbose' into 'master'

print build-server output when verbose flag is set

Closes #213

See merge request fdroid/fdroidserver!219

6 years agoMerge branch '368-makebuildserver-fails-checkey-101' into 'master'
Hans-Christoph Steiner [Fri, 15 Sep 2017 09:01:12 +0000 (09:01 +0000)]
Merge branch '368-makebuildserver-fails-checkey-101' into 'master'

remove checkey from jenkins-build-makebuildserver

Closes #368

See merge request fdroid/fdroidserver!337

6 years agoremove checkey from jenkins-build-makebuildserver
Michael Pöhn [Thu, 14 Sep 2017 09:28:12 +0000 (11:28 +0200)]
remove checkey from jenkins-build-makebuildserver

6 years agotests: don't touch config.py, no config is fine now
Marcus Hoffmann [Thu, 14 Sep 2017 00:14:26 +0000 (02:14 +0200)]
tests: don't touch config.py, no config is fine now

6 years agocommon: allow starting without a config file
Marcus Hoffmann [Tue, 12 Sep 2017 14:21:29 +0000 (16:21 +0200)]
common: allow starting without a config file

There is no reason this should be disallowed as the default config often
works well when building simple apps.

6 years agomake sure config exists before writing to it
Marcus Hoffmann [Thu, 14 Sep 2017 00:13:49 +0000 (02:13 +0200)]
make sure config exists before writing to it

6 years agobash_completion: add update --create-key option
Marcus Hoffmann [Thu, 14 Sep 2017 00:03:43 +0000 (02:03 +0200)]
bash_completion: add update --create-key option

6 years agolog build-server output when verbose flag is set
Michael Pöhn [Wed, 13 Sep 2017 23:38:34 +0000 (01:38 +0200)]
log build-server output when verbose flag is set

6 years agobash_completion: fix option completion
Marcus Hoffmann [Wed, 13 Sep 2017 12:02:04 +0000 (14:02 +0200)]
bash_completion: fix option completion

Line breaks need to be escaped in the command list.

6 years agoadd all subcommands to bash completion
Hans-Christoph Steiner [Wed, 13 Sep 2017 07:53:26 +0000 (09:53 +0200)]
add all subcommands to bash completion

The bash completion needs a modernization, but this at least makes all the
subcommands work.
#374

6 years agoMerge branch 'fix_gplay_check' into 'master'
Hans-Christoph Steiner [Wed, 13 Sep 2017 07:18:46 +0000 (07:18 +0000)]
Merge branch 'fix_gplay_check' into 'master'

Fix gplay check

See merge request !333

6 years agocheckupdates: use html.unescape instead of HTMLParser.unescape
Marcus Hoffmann [Tue, 12 Sep 2017 23:42:15 +0000 (01:42 +0200)]
checkupdates: use html.unescape instead of HTMLParser.unescape

HTMLParser.unescape is only an internal method and deprecated.
This requires Pyhton 3.4.

6 years agocheckupdates: fix google play check method
Marcus Hoffmann [Tue, 12 Sep 2017 23:40:09 +0000 (01:40 +0200)]
checkupdates: fix google play check method

This has never worked with python3 and was also not properly adapted to
apps as objects. So we fix both of these issues.

6 years agoMerge branch 'refuse-publishing-duplicate-apks' into 'master'
Hans-Christoph Steiner [Tue, 12 Sep 2017 15:33:51 +0000 (15:33 +0000)]
Merge branch 'refuse-publishing-duplicate-apks' into 'master'

proper error message when publishing with the same app in repo and unsigned

See merge request !329

6 years agoMerge branch 'warn_on_aar' into 'master'
Hans-Christoph Steiner [Tue, 12 Sep 2017 15:29:29 +0000 (15:29 +0000)]
Merge branch 'warn_on_aar' into 'master'

scanner: warn on aar files

See merge request !332

6 years agoMerge branch 'scanner_refactoring' into 'master'
Hans-Christoph Steiner [Mon, 11 Sep 2017 15:47:57 +0000 (15:47 +0000)]
Merge branch 'scanner_refactoring' into 'master'

Scanner refactoring

See merge request !330

6 years agoscanner: warn on aar files
Marcus Hoffmann [Sun, 3 Sep 2017 22:57:38 +0000 (00:57 +0200)]
scanner: warn on aar files

6 years agoscanner: rename variables, use os.path.relpath
Marcus Hoffmann [Mon, 11 Sep 2017 14:46:54 +0000 (16:46 +0200)]
scanner: rename variables, use os.path.relpath

* rename fd -> path_in_build_dir
* rename fp -> filepath
* use os.path.reldir instead of string manipulation

6 years agoscanner: more descriptive variable names from os.walk
Marcus Hoffmann [Mon, 4 Sep 2017 14:11:27 +0000 (16:11 +0200)]
scanner: more descriptive variable names from os.walk

This uses the names from python documentation of os.walk().

6 years agoproper error message when publishing with the same app in repo and unsigned
Michael Pöhn [Tue, 30 May 2017 12:53:54 +0000 (14:53 +0200)]
proper error message when publishing with the same app in repo and unsigned

6 years agoMerge branch 'close-subprocess-file-handles' into 'master'
Hans-Christoph Steiner [Thu, 7 Sep 2017 09:51:08 +0000 (09:51 +0000)]
Merge branch 'close-subprocess-file-handles' into 'master'

make sure file-streams of subprocesses get closed

See merge request !328

6 years agoMerge branch 'close-subprocess-file-handles' into 'master'
Hans-Christoph Steiner [Thu, 7 Sep 2017 09:49:51 +0000 (09:49 +0000)]
Merge branch 'close-subprocess-file-handles' into 'master'

make sure file-streams of subprocesses get closed

See merge request !328

6 years agoMerge branch 'signatures-subcommand' into 'master'
Hans-Christoph Steiner [Thu, 7 Sep 2017 09:04:25 +0000 (09:04 +0000)]
Merge branch 'signatures-subcommand' into 'master'

signatures command

See merge request !327

6 years agomake sure file-streams of subprocesses get closed
Michael Pöhn [Thu, 7 Sep 2017 00:36:58 +0000 (02:36 +0200)]
make sure file-streams of subprocesses get closed

6 years agoadded signatures subcommand
Michael Pöhn [Wed, 6 Sep 2017 13:54:16 +0000 (15:54 +0200)]
added signatures subcommand

6 years agoMerge branch 'dont-list-fdroid-subcommands-in-random-order' into 'master'
Hans-Christoph Steiner [Tue, 5 Sep 2017 14:45:57 +0000 (14:45 +0000)]
Merge branch 'dont-list-fdroid-subcommands-in-random-order' into 'master'

don't list fdroid subcommands in random order

See merge request !326

6 years agodont list fdroid subcommands in random order
Michael Pöhn [Mon, 4 Sep 2017 12:29:30 +0000 (14:29 +0200)]
dont list fdroid subcommands in random order

6 years agoremove trailing whitespace
Marcus Hoffmann [Sun, 3 Sep 2017 17:30:00 +0000 (19:30 +0200)]
remove trailing whitespace

6 years agomakebuildserver: add comment about not upgrading sdk-tools
Marcus Hoffmann [Sun, 3 Sep 2017 16:33:03 +0000 (18:33 +0200)]
makebuildserver: add comment about not upgrading sdk-tools

6 years agoMerge branch 'apk_output_location' into 'master'
Michael Pöhn [Fri, 1 Sep 2017 12:21:05 +0000 (12:21 +0000)]
Merge branch 'apk_output_location' into 'master'

handle gradle-plugin 3.0 output apk location

Closes #363

See merge request !321

6 years agoMerge branch 'metadata_v0_test' into 'master'
Hans-Christoph Steiner [Thu, 31 Aug 2017 19:51:09 +0000 (19:51 +0000)]
Merge branch 'metadata_v0_test' into 'master'

bump fdroid version to test against to 0.8 remove legacy handling

See merge request !324

6 years agoCI: bump fdroid version to test against to 0.8 remove legacy handling
Marcus Hoffmann [Thu, 31 Aug 2017 18:36:07 +0000 (20:36 +0200)]
CI: bump fdroid version to test against to 0.8 remove legacy handling

Bump to latest released version, remove all handling of things that
changed in a backward incompatible way before.

6 years agoMerge branch 'mr/update_docker-py' into 'master'
Hans-Christoph Steiner [Thu, 31 Aug 2017 12:48:18 +0000 (12:48 +0000)]
Merge branch 'mr/update_docker-py' into 'master'

setup.py: unstick docker-py and requests dependencies

See merge request !318

6 years agoMerge branch 'mr/verify_ca_certs_v2' into 'master'
Marcus Hoffmann [Mon, 28 Aug 2017 15:05:24 +0000 (15:05 +0000)]
Merge branch 'mr/verify_ca_certs_v2' into 'master'

makebuildserver: verify https all requests to avoid urllib3 warnings

See merge request !316

6 years agoMerge branch 'revert-af707cd1' into 'master'
Marcus Hoffmann [Sun, 27 Aug 2017 22:40:49 +0000 (22:40 +0000)]
Merge branch 'revert-af707cd1' into 'master'

Revert "setup.py: don't use pyasn1 to 0.3.3 until pyasn1-modules is updated to support it"

See merge request !322

6 years agoRevert "setup.py: don't use pyasn1 to 0.3.3 until pyasn1-modules is updated to suppor...
Marcus Hoffmann [Sun, 27 Aug 2017 22:07:49 +0000 (22:07 +0000)]
Revert "setup.py: don't use pyasn1 to 0.3.3 until pyasn1-modules is updated to support it"

This reverts commit af707cd1cb86ff8c3f8931adc0f874cd976cf391

6 years agosetup.py: don't use pyasn1 to 0.3.3 until pyasn1-modules is updated to support it
Marcus Hoffmann [Sun, 27 Aug 2017 21:58:40 +0000 (21:58 +0000)]
setup.py: don't use pyasn1 to 0.3.3 until pyasn1-modules is updated to support it

Latest pyasn1-modules hard codes pyasn1-0.3.2, so this currently break our tests.
Ref: https://github.com/etingof/pyasn1-modules/issues/4

6 years agoMerge branch 'mr/update_platforms_tools' into 'master'
Marcus Hoffmann [Sun, 27 Aug 2017 19:41:16 +0000 (19:41 +0000)]
Merge branch 'mr/update_platforms_tools' into 'master'

makebuildserver: update platform and build tool releases

See merge request !317

6 years agoadd comments to gradle output directories
Marcus Hoffmann [Sat, 26 Aug 2017 15:03:13 +0000 (17:03 +0200)]
add comments to gradle output directories

6 years agohandle gradle-plugin 3.0 output apk location
Marcus Hoffmann [Sat, 26 Aug 2017 10:55:34 +0000 (12:55 +0200)]
handle gradle-plugin 3.0 output apk location

This commit adds support for new gradle plugin 3.0 output directories.
The new structure looks like this:

build/outputs/apk/<flavour1><Flavour2>/release/*.apk

Note the capitalization on the different flavour components.
So if we build a specific flavour combination we add this combination to
the path where we look for an output .apk.

Closes #363

Based on !320 by: Michel Le Bihan <michel@lebihan.pl>
Signed-off-by: Marcus Hoffmann <bubuiic@aol.com>
6 years agoMerge branch 'local_metadata' into 'master'
Michael Pöhn [Tue, 22 Aug 2017 16:46:07 +0000 (16:46 +0000)]
Merge branch 'local_metadata' into 'master'

metadata: also read .fdroid.txt metadata

Closes #364

See merge request !319

6 years agometadata: also read .fdroid.txt metadata
Marcus Hoffmann [Mon, 21 Aug 2017 22:03:43 +0000 (00:03 +0200)]
metadata: also read .fdroid.txt metadata

This is documented as working here:
https://f-droid.org/docs/Building_Applications/
(second to last paragraph)

fixes #364

6 years agosetup.py: unstick docker-py and requests dependencies
Marcus Hoffmann [Wed, 16 Aug 2017 23:47:06 +0000 (01:47 +0200)]
setup.py: unstick docker-py and requests dependencies

docker-py 1.10.6 is the last version released under docker-py, after that it
will be just docker, but has breaking changes, see:
https://github.com/docker/docker-py/releases/tag/2.0.0

Update the list of allowed versions of requests to docker-py master.

6 years agomakebuildserver: update platform and build tool releases
Marcus Hoffmann [Wed, 16 Aug 2017 22:41:23 +0000 (00:41 +0200)]
makebuildserver: update platform and build tool releases

Update platform-25 to r03
Update platform-26 to r02
Add build-tools_r26.0.1

sha256 signatures locally computed after verifying the sha1 signature provided
by the repository2-1.xml file.

All these will be downloaded and installed in the buildserver through
provision-android-sdk anyway but this adds them to the cache.

6 years agomakebuildserver: verify https all requests to avoid urllib3 warnings
Marcus Hoffmann [Wed, 16 Aug 2017 22:49:53 +0000 (00:49 +0200)]
makebuildserver: verify https all requests to avoid urllib3 warnings

According to http://docs.python-requests.org/en/master/user/advanced/#ca-certificates
python-requests >= 2.4.0 will use the certifi provided certificates.
We already recommend installing python3-certifi in the docs.
On debian requests is patched to use the system trust store instead.

6 years agoMerge branch 'gradle-updates' into 'master'
Hans-Christoph Steiner [Tue, 15 Aug 2017 15:49:58 +0000 (15:49 +0000)]
Merge branch 'gradle-updates' into 'master'

makebuildserver: add Gradle 3.5.1, 4.0.1, 4.0.2 and 4.1

See merge request !313

6 years agoMerge branch 'ndk-r15c' into 'master'
Hans-Christoph Steiner [Tue, 15 Aug 2017 15:48:50 +0000 (15:48 +0000)]
Merge branch 'ndk-r15c' into 'master'

makebuildserver: upgrade NDK r15b to r15c

See merge request !314

6 years agomakebuildserver: add Gradle 3.5.1, 4.0.1, 4.0.2 and 4.1
relan [Mon, 7 Aug 2017 11:46:08 +0000 (14:46 +0300)]
makebuildserver: add Gradle 3.5.1, 4.0.1, 4.0.2 and 4.1

Android Gradle plugin 3.0.0 requires Gradle 4.1.

6 years agomakebuildserver: upgrade NDK r15b to r15c
relan [Fri, 11 Aug 2017 07:19:40 +0000 (10:19 +0300)]
makebuildserver: upgrade NDK r15b to r15c

6 years agometadata: handle empty YAML files without crashing 0.8
Hans-Christoph Steiner [Thu, 27 Jul 2017 01:21:28 +0000 (18:21 -0700)]
metadata: handle empty YAML files without crashing

!311

6 years agoupdate: test metadata creation using internal and external templates
Hans-Christoph Steiner [Wed, 26 Jul 2017 22:34:13 +0000 (15:34 -0700)]
update: test metadata creation using internal and external templates

There is a hardcoded template in update.py, and there is also the
possibility for the user to create a template.yml.  This tests both of them
and cleans up the related code a bit.

#352 !310

6 years agoadd missing comma in setup.py
Hans-Christoph Steiner [Wed, 26 Jul 2017 13:38:47 +0000 (06:38 -0700)]
add missing comma in setup.py

6 years agoMerge branch 'metadata' into 'master'
Hans-Christoph Steiner [Wed, 26 Jul 2017 18:14:33 +0000 (18:14 +0000)]
Merge branch 'metadata' into 'master'

preserve order and formatting on creating Metadata from Yaml template (closes #352)

Closes #352

See merge request !310

6 years agopreserve order and formatting on creating Metadata from Yaml template (closes #352)
Izzy [Wed, 26 Jul 2017 07:22:01 +0000 (09:22 +0200)]
preserve order and formatting on creating Metadata from Yaml template (closes #352)

6 years agoBump to 0.8
Hans-Christoph Steiner [Wed, 19 Jul 2017 14:21:50 +0000 (16:21 +0200)]
Bump to 0.8

6 years agoupdate pypi "classifiers"
Hans-Christoph Steiner [Wed, 19 Jul 2017 14:12:06 +0000 (16:12 +0200)]
update pypi "classifiers"