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

Create mono repository #1650

Merged
merged 22 commits into from Sep 5, 2018

Conversation

Projects
None yet
3 participants
@ripcurlx
Member

ripcurlx commented Sep 5, 2018

Based on the RECONSOLIDATION-LOG by @cbeams and the mono branch by @chirhonul.

ripcurlx and others added some commits Sep 5, 2018

@ripcurlx ripcurlx requested review from ManfredKarrer and cbeams Sep 5, 2018

@ripcurlx

This comment has been minimized.

Member

ripcurlx commented Sep 5, 2018

Please @cbeams and @ManfredKarrer have a look at all the changes. It works for me so far. The only thing that is still open is that gradle install fails with A POM cannot have multiple artifacts with the same type and classifier. Already have MavenArtifact bisq:zip:zip:null, trying to add MavenArtifact bisq:zip:zip:null.

@cbeams

cbeams approved these changes Sep 5, 2018

ACK. Thanks so much for putting this together, @chirhonul and @ripcurlx.

There are a few changes I'd like to make to the readme regarding instructions for building and importing into IDEA, but don't have the time just now. @ManfredKarrer is traveling, so I'm not sure if he'll have time to review. I'll leave it to you when to merge. I can get my changes in by tomorrow for sure, but they can also be done as a separate PR.

I'll also rearrange the names of the repositories once this is merged, renaming the current bisq-network/bisq to something that gets it out of the way and renaming bisq-network/bisq-desktop to bisq-network/bisq. Sound good?

As I've said before, there are various improvements to the build that we can do to make it a more idiomatic multi-project build, but they can all come afterward. As it is, everything builds and imports cleanly for me (with the right instructions that I'll add to the readme), so thumbs up from my side.

@ripcurlx

This comment has been minimized.

Member

ripcurlx commented Sep 5, 2018

I think @ManfredKarrer would be fine with the PR if it works at least already for the two of us. He also knew what @chirhonul came up with in his mono branch. I'll merge it now, as I also want to start merging locally my other two branches I'm working on (redesign, java9/10) with the new structure.

@ripcurlx ripcurlx merged commit 708d9a4 into bisq-network:master Sep 5, 2018

1 check passed

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

This comment has been minimized.

Member

ripcurlx commented Sep 5, 2018

@cbeams The changes you mentioned sound fine with me! Thanks!

cbeams added a commit to cbeams/bisq that referenced this pull request Sep 7, 2018

Overhaul README
As a follow-on to the monorepo reconsolidation (bisq-network#1650):

 - Revise and shorten "What is Bisq" section
 - Remove outdated sections
 - Remove sections documented elsewhere
 - Add instructions for building, running and importing into IDEA

cbeams added a commit to cbeams/bisq that referenced this pull request Sep 7, 2018

Overhaul README
As a follow-on to the monorepo reconsolidation (bisq-network#1650):

 - Revise and shorten "What is Bisq" section
 - Remove outdated sections
 - Remove sections documented elsewhere
 - Add instructions for building, running and importing into IDEA

@cbeams cbeams referenced this pull request Sep 7, 2018

Merged

Overhaul README #1661

@ripcurlx ripcurlx referenced this pull request Sep 27, 2018

Closed

For September #126

@cbeams cbeams referenced this pull request Sep 30, 2018

Open

Bisq Maintainer #63

@chirhonul chirhonul referenced this pull request Nov 29, 2018

Closed

For November 2018 #169

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment