Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes kiwix-android issue#765 #289

Merged
merged 5 commits into from
Oct 3, 2019

Conversation

Aditya-Sood
Copy link
Contributor

  • Contains changes to JNIKiwixReader for kiwix-android which fix issue #765

  • Since kiwix-build relies on using the master branch of the kiwix-lib source code, the PR for updated code of kiwix-android needs to use the same version of kiwix-lib as the one which has this PR merged

@codecov
Copy link

codecov bot commented Sep 30, 2019

Codecov Report

Merging #289 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master     #289   +/-   ##
=======================================
  Coverage   11.59%   11.59%           
=======================================
  Files          43       43           
  Lines        3371     3371           
  Branches     1764     1764           
=======================================
  Hits          391      391           
  Misses       2817     2817           
  Partials      163      163

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 2aebffb...2af9ba4. Read the comment docs.

@kelson42
Copy link
Collaborator

This branch needs to be rebased

@Aditya-Sood
Copy link
Contributor Author

@kelson42 I had merged with master yesterday before pushing
Do you want me to undo that and rebase instead?

@kelson42
Copy link
Collaborator

kelson42 commented Oct 1, 2019

@Aditya-Sood Yes, the rules are not the same as on kiwix-android. Here the feature branches need to be rebased properly on master before review/merge. So never ever a merge from master in a feature branch on this repo... and in general in all repos (except kiwix-android).

@Aditya-Sood Aditya-Sood force-pushed the kiwix-android/issue/765 branch from 02d1ab0 to 2af9ba4 Compare October 1, 2019 08:01
@Aditya-Sood
Copy link
Contributor Author

@kelson42 I've re-based the branch

@kelson42 kelson42 requested review from kelson42 and macgills October 2, 2019 20:52
@kelson42 kelson42 merged commit efe1c2d into kiwix:master Oct 3, 2019
@Aditya-Sood
Copy link
Contributor Author

@kelson42 what is the expected date of the next kiwix-lib version release? I'll set a reminder for updating the complimentary kiwix-android PR accordingly

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants