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

Refactor the build^2 #456

Closed
wants to merge 3 commits into from

Conversation

dwijnand
Copy link
Member

First off this PR builds on #455 ("Merge 1.0.x into 1.x") because there are some build changes differences between 1.0.x and 1.x that I didn't want to merge 3 times (in each PR, and the merge of the PRs). However I can make this PR independent of that if that's better.

This PR is a re-take on @jvican's #428, with a number of adjustments, the two most important ones being (1) it targets the 1.x branch and (2) it uses bare name keys (rather than, e.g "Keys.version"). So it's @jvican's 543dcb0 commit from his #429 build PR.

If this PR is accepted and merged I'll take care of rebasing (and reviewing) @jvican's efforts in #429 so hopefully it too can be merged.

@jvican, please review my re-take here, I'm happy to explain my reasoning.

@dwijnand
Copy link
Member Author

Rebased on rebased #455.

@dwijnand dwijnand force-pushed the improvements-sbt-build-dnw-rebase branch from 8f3c3fd to 80bb2a2 Compare November 23, 2017 15:24
@dwijnand
Copy link
Member Author

With #455 merged, rebased on 1.x.

@dwijnand dwijnand force-pushed the improvements-sbt-build-dnw-rebase branch from 80bb2a2 to 36f3764 Compare November 23, 2017 15:26
@dwijnand
Copy link
Member Author

CI was failing because there were files in the 1.x branch that didn't have headers (and this is now enforced by CI). That's now fixed.

@jvican
Copy link
Member

jvican commented Nov 23, 2017

First, thank you for doing this. Tests are still failing. Second, I'm travelling these days -- I'll get back to this as soon as I'm home, and I will also reply to the pertinent open thread.

@dwijnand
Copy link
Member Author

First, thank you for doing this. Tests are still failing.

My pleasure.

Second, I'm travelling these days -- I'll get back to this as soon as I'm home, and I will also reply to the pertinent open thread.

Not a worry - safe travels.

@dwijnand dwijnand force-pushed the improvements-sbt-build-dnw-rebase branch 2 times, most recently from a76039f to 84a64db Compare November 28, 2017 11:54
This is a squashed commit.

This is a general list of the things that are done.

- Port common settings and commands to BuildPlugin
- Remove repeated resolvers
- Move `relaxNon212` to the build plugin
- Move build and alternative publish settings.  This commit consolidates
the build settings and the settings to set up the alternative publishing
process into the `BuildPlugin`.
- Move `noPublish` to the `BuildPlugin`
- Move the rest of the build logic to the plugin
@dwijnand dwijnand force-pushed the improvements-sbt-build-dnw-rebase branch from 84a64db to 32d685f Compare November 28, 2017 12:48
@jvican
Copy link
Member

jvican commented Jan 15, 2018

@dwijnand Tests continue to fail. Can you take care of this and I'll take care of #429? It'll be easier for you since the other longer PR has more sensitive commits that are context dependent. Will be no fun to rebase it, but someone has to do it, and I prefer to remove that hassle from you.

@jvican
Copy link
Member

jvican commented Apr 18, 2018

@dwijnand Let's close this, given that either of us have the time to work on this. Please re-open if you wanna tackle it soon.

@jvican jvican closed this Apr 18, 2018
@dwijnand dwijnand deleted the improvements-sbt-build-dnw-rebase branch April 18, 2018 15:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants