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

bring development branch up to date with master #9

Merged
merged 25 commits into from Oct 22, 2020
Merged

Conversation

JohnRDOrazio
Copy link
Member

continue development that was being done on JCEF branch, in the development branch, now that things are starting to be in place and starting to behave nicely

remove the reference to the JCEF32 library, and move the required JCEF jars directly into the libraries folder
even if this commit is partial, I need to push so that I can continue working from my home computer during the weekend. Note that OptionsFrame.java is still in the works, especially the javascript portion of the preview document, I'm still formatting it (borrowed from the Word add-in vb.net script). I also staretd creating LocalizedBibleBooks.java but it is also incomplete!
For Java 1.8 we can use Apache Derby 10.14, it seems that 10.15 requires Java 1.9 which however is only 64bit. On Windows at least we need Java 1.8 32 bit so let's stick with Apache Derby 10.14, downloaded from here: https://downloads.apache.org/db/derby/db-derby-10.14.2.0/
@JohnRDOrazio JohnRDOrazio merged commit e82ae79 into development Oct 22, 2020
JohnRDOrazio added a commit that referenced this pull request Oct 22, 2020
Merge pull request #9 from BibleGet-I-O/master
@JohnRDOrazio JohnRDOrazio mentioned this pull request Oct 30, 2020
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.

None yet

1 participant