Synchronize AndBible/jsword, CrossWire/jsword and STEPBible/jsword to make CrossWire/jsword authoritative again.

[dmsmith]

Goal: CrossWire/jsword to be the co-maintained, authoritative master for AndBible and STEPBible (others?).

AndBible is 20-35 commits (develop branch is closer than master) behind CrossWire/jsword but many, many commits ahead.
Looking at the 20-35 commits, it doesn't look like there's much of a problem to merge them into AndBible/jsword.

Once that is done, I'd like to collaborate to merge AndBible/jsword into CrossWire/jsword. It looks like it'll be a bit messy. I'm thinking of an andbible-integrate branch for the merge. We'll need committers to be added to CrossWire/jsword from the AndBible project.

I mention STEPBible/jsword because the same needs to be done with it into CrossWire/jsword. It is further behind CrossWire/jsword and also further ahead. Apparently, it was merged in the past into AndBible but has diverged since. Ultimately these will need to be merged into AndBible/jsword. We'll also need committers from the STEPBible project.

There will be files that really conflict, API differences between these forks. These will need to be carefully considered.

[dmsmith]

In crosswire/jsword, there is a branch integrate-andbible, which contains the integration of AndBible master and CrossWire's master implementation of JSword.

There was only one minor merge conflict. I visually examined all the changes and they made sense to me.

This needs to be tested. The pom.xml file needs to be updated to match the gradle build. I need to learn gradle and to set up CI/DI on GitHub.

The tests do not all run correctly. Most of the problems are with KJV.properties. The other is a minor problem with a module that has been changed since the test was written.

Once this is done, I need to test it within BibleDesktop. @tuomas2 within AndBible.

I've added @tuomas2, @mjdenham and @chrisburrell as writers.

[dmsmith]

@tuomas please take a look at integrate-andbible in crosswire/jsword.

[tuomas2]

Trying to get back to business with this effort too. Sorry for long long delay...

How would it be best to review integrate-andbible? Comparing it to AndBible's branch (#19)? Or just testing it with AndBible?

Or should we try to get #18 in first?

[dmsmith]

Well the branch on crosswire/jsword doesn't compile because it does not pass integration tests. Specifically, there is an action in and bible/jsword that pulls in modules and runs CI/DI. I was waiting for you to have some time to look at it.

Wrt reviewing I was thinking that testing it in AndBible would be best. It should be really close to what you have already. If you feel that we should do it more incrementally, I'm fine with that.

[tuomas2]

I reviewed changes in integrate-andbible and they looked good to me. I now merged it to AndBible/jsword master branch. AndBible starts and runs ok. Upgraded jsword is now enabled in my feature development branch, so will test it more later.

[dmsmith]

I'll be merging it into jsword's master. I'll close that when this is done.

[dmsmith]

integrate-andbible has been merged into JSword master. The CI is failing as it pulled in what AndBible had and it is not set up properly here.

Next up integration of STEP Bible.

[tuomas2]

Okay perhaps time for me to sync my branch with your master then!

[tuomas2]

Done with that. Should we close this ticket now?

[dmsmith]

Yay! Now merged!

We need to ultimately move development of features to CrossWire/JSword, but that's a different effort.