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

Upgrade bitcoinj version to the one built with jdk 10 #2564

Merged
merged 1 commit into from Mar 19, 2019

Conversation

Projects
None yet
2 participants
@oscarguindzberg
Copy link
Contributor

commented Mar 19, 2019

No description provided.

@oscarguindzberg

This comment has been minimized.

Copy link
Contributor Author

commented Mar 19, 2019

Be careful: First merge #2563 and then #2564 . The latest bitcoinj version is the one included in #2564 .

@ManfredKarrer
Copy link
Member

left a comment

utACK

@oscarguindzberg oscarguindzberg force-pushed the oscarguindzberg:bitcoinjjdk10 branch from d48013b to 1746b14 Mar 19, 2019

@oscarguindzberg

This comment has been minimized.

Copy link
Contributor Author

commented Mar 19, 2019

@ManfredKarrer I just rebased from master to resolve merge conflicts that showed up after you merged #2563

PR is ready to be merged.

@ManfredKarrer ManfredKarrer merged commit 28970d1 into bisq-network:master Mar 19, 2019

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

@oscarguindzberg oscarguindzberg deleted the oscarguindzberg:bitcoinjjdk10 branch Mar 20, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.