Skip to content

Issue 650 872 multi license headers - #990

Merged
nedtwigg merged 8 commits into
diffplug:mainfrom
bitnaprednost:ISSUE-650-872-multi-license-headers
Dec 1, 2021
Merged

Issue 650 872 multi license headers#990
nedtwigg merged 8 commits into
diffplug:mainfrom
bitnaprednost:ISSUE-650-872-multi-license-headers

Conversation

@igorbeslic

Copy link
Copy Markdown
Contributor

Fixes #650
Fixes #872

@nedtwigg nedtwigg left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great PR! Only needs a few minor tweaks, plus docs + changelog entries. EDIT: I see you have an entry for plugin-gradle/CHANGES, we also need an entry for the root CHANGES.md also.

Comment thread lib/src/main/java/com/diffplug/spotless/FormatterStep.java Outdated
Comment thread plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java Outdated
Comment thread plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java Outdated
@igorbeslic

Copy link
Copy Markdown
Contributor Author

@nedtwigg Would it be fine if I just update this existing PR with commit with changes??
PS. Don't be afraid to point code style problems I'll adopt it. I also come from strict "style and convention tribe". I understand it 💯

@nedtwigg

nedtwigg commented Nov 9, 2021

Copy link
Copy Markdown
Member

I prefer new commits to reduce review burden :)

Igor Beslic added 7 commits November 9, 2021 22:52
…icense header variant inside one format, names should be unique, if content pattern is not set or there are multiple matches, last licenseHeader wins
…isLicenseHeaderStep method to subclasses to maintain check in one class
…anges text to follow style of previous entries
@igorbeslic
igorbeslic force-pushed the ISSUE-650-872-multi-license-headers branch from 6dd24d6 to 8037240 Compare November 9, 2021 21:58
@nedtwigg

Copy link
Copy Markdown
Member

You've got some spotbugs warnings. You can view locally with spotbugsMain, here's the issue from CI:

https://8354-34685800-gh.circle-artifacts.com/0/lib/build/spotbugs/main.html#NP_NONNULL_RETURN_VIOLATION

@igorbeslic

Copy link
Copy Markdown
Contributor Author

You've got some spotbugs warnings. You can view locally with spotbugsMain, here's the issue from CI:

https://8354-34685800-gh.circle-artifacts.com/0/lib/build/spotbugs/main.html#NP_NONNULL_RETURN_VIOLATION

:) @nedtwigg thank you for patience - I superficially went through contributing and code_of_conduct - it is cause of glitches you see in my PR

@igorbeslic
igorbeslic requested a review from nedtwigg November 14, 2021 10:23
@nedtwigg
nedtwigg merged commit db3ae46 into diffplug:main Dec 1, 2021
@nedtwigg

nedtwigg commented Dec 1, 2021

Copy link
Copy Markdown
Member

Very sorry for the long delay, this is an excellent PR that deserved to be merged and released quicker.

@nedtwigg

nedtwigg commented Dec 1, 2021

Copy link
Copy Markdown
Member

Published in plugin-gradle/6.0.1.

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.

Support multiple license headers disable license rule for specific file

2 participants