Merge pull request #1482 from kiwix/develop

Merge Develop changes to 3.0
This commit is contained in:
Seán Mac Gillicuddy 2019-09-17 10:03:53 +01:00 committed by GitHub
commit 705318d2fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 13 deletions

View File

@ -3,7 +3,7 @@
<img src="https://play.google.com/intl/en/badges/images/badge_new.png" alt="Get it on Google Play" height="30" />
</a>
<a href="https://f-droid.org/fr/packages/org.kiwix.kiwixmobile/" target="_blank" align="left">
<img src="https://upload.wikimedia.org/wikipedia/commons/thumb/0/0d/Get_it_on_F-Droid.svg/320px-Get_it_on_F-Droid.svg.png" alt="Get it on F-Droid" height="30" />
<img src="https://upload.wikimedia.org/wikipedia/commons/thumb/0/0d/Get_it_on_F-Droid.svg/320px-Get_it_on_F-Droid.svg.png" alt="Get it on F-Droid" height="29" />
</a>
# Kiwix-Android
@ -21,6 +21,7 @@ pieces in Java).
[![codecov](https://codecov.io/gh/kiwix/kiwix-android/branch/develop/graph/badge.svg)](https://codecov.io/gh/kiwix/kiwix-android)
[![CodeFactor](https://www.codefactor.io/repository/github/kiwix/kiwix-android/badge)](https://www.codefactor.io/repository/github/kiwix/kiwix-android)
[![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
[![Public Chat](https://img.shields.io/badge/public-chat-green)](https://chat.kiwix.org)
## Build Instructions
@ -49,6 +50,7 @@ different versions of our app. Ensure your build variant is
- [MockK](https://github.com/mockk/mockk) - Kotlin mocking library that allows mocking of final classes by default.
- [JUnit5](https://github.com/junit-team/junit5/) - The next generation of JUnit
- [AssertJ](https://github.com/joel-costigliola/assertj-core) - Fluent assertions for test code
- [Fetch](https://github.com/tonyofrancis/Fetch) - A customizable file download manager library for Android
## Contributing
@ -73,19 +75,17 @@ guidelines. Pull requests not matching the style will be rejected.
## Communication
Please use IRC to discuss questions regarding the project: #kiwix on
irc.freenode.net
You can use IRC web interface on
[http://chat.kiwix.org/](http://chat.kiwix.org/).
Our other sources of communications include:
- Email: contact@kiwix.org
- Mailing list: kiwix-developer@lists.sourceforge.net
Available communication channels:
* [Web Public Chat channel](https://chat.kiwix.org)
* [Email](mailto:contact+android@kiwix.org)
* [Mailing list](kiwix-developer@lists.sourceforge.net)
* [https://kiwixoffline.slack.com]: #android channel
* IRC: #kiwix on irc.freenode.net
For more information, please refer to
[https://wiki.kiwix.org/wiki/Communication](https://wiki.kiwix.org/wiki/Communication).
## LEGAL & DISCLAIMER
## License
Please refer to [COPYING](COPYING).
[GPLv3](https://www.gnu.org/licenses/gpl-3.0) or later, see
[COPYINGL](COPYING) for more details.

View File

@ -53,7 +53,7 @@ dependencies {
// Get kiwixlib online if it is not populated locally
if (!shouldUseLocalVersion()) {
implementation 'org.kiwix.kiwixlib:kiwixlib:6.0.4'
implementation 'org.kiwix.kiwixlib:kiwixlib:7.0.0'
} else {
implementation 'com.getkeepsafe.relinker:relinker:1.3.1'
implementation fileTree(include: ['*.aar'], dir: 'libs')