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

Enable and apply Spotless #8401

Merged
merged 2 commits into from Sep 5, 2020
Merged

Conversation

wborn
Copy link
Member

@wborn wborn commented Sep 5, 2020

Let's enable and apply Spotless.

Replaces #8068

The issues Spotless found in the feature.xml are resolved by making sure the openhab_wst_feature_file.prefs include config matches.

I suggest to do follow up PRs for any further improvements.
That way we can quickly merge this PR and it doesn't turn into a merge conflict magnet. 🧲 😉

Signed-off-by: Wouter Born <github@maindrain.net>
Signed-off-by: Wouter Born <github@maindrain.net>
@fwolter fwolter merged commit d4cda9d into openhab:2.5.x Sep 5, 2020
@wborn wborn deleted the enable-apply-spotless branch September 5, 2020 10:31
Comment on lines +97 to +98
If the
last level cannot be determined, the value of onLevel will be used instead.
Copy link
Member

Choose a reason for hiding this comment

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

I don't understand why it made this change, The line isn't as long as the one above it, and the break was inserted in a very odd place.

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes I also noticed that and have now created #8413 to improve the formatting. It seems to format well when all text is on one line but seems to bug when there is still room left on previous lines.

@kaikreuzer
Copy link
Member

@wborn It seems this broke our sandbox/release build since the version plugin changes the poms in a way that spotless complains, see https://ci.openhab.org/view/Sandbox/job/sandbox-openhab2-release/1634/consoleFull.

What can we do about that?

@wborn
Copy link
Member Author

wborn commented Sep 9, 2020

The quick fix is probably adding -Dspotless.check.skip=true to some release steps.

A nicer fix would be if the pipeline wouldn't touch the formatting or would run spotless:apply so we don't have to manually do this after every release. WDYT @pfink?

CSchlipp pushed a commit to CSchlipp/openhab-addons that referenced this pull request Sep 12, 2020
Signed-off-by: Wouter Born <github@maindrain.net>
kaikreuzer added a commit to openhab/openhab-distro that referenced this pull request Sep 13, 2020
Related to openhab/openhab-addons#8401

Signed-off-by: Kai Kreuzer <kai@openhab.org>
wborn pushed a commit to openhab/openhab-distro that referenced this pull request Sep 14, 2020
Related to openhab/openhab-addons#8401

Signed-off-by: Kai Kreuzer <kai@openhab.org>
kaikreuzer added a commit to openhab/openhab-distro that referenced this pull request Sep 16, 2020
Related to openhab/openhab-addons#8401

Signed-off-by: Kai Kreuzer <kai@openhab.org>
kaikreuzer added a commit to openhab/openhab-distro that referenced this pull request Sep 16, 2020
Related to openhab/openhab-addons#8401

Signed-off-by: Kai Kreuzer <kai@openhab.org>
@wborn wborn added this to the 2.5.9 milestone Sep 18, 2020
markus7017 pushed a commit to markus7017/openhab-addons that referenced this pull request Sep 19, 2020
Signed-off-by: Wouter Born <github@maindrain.net>
andrewfg pushed a commit to andrewfg/openhab-addons that referenced this pull request Oct 8, 2020
Signed-off-by: Wouter Born <github@maindrain.net>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
infrastructure Build system and Karaf related issues and PRs
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants