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

Fix scalafmt formatting #337

Merged
merged 3 commits into from
May 26, 2020
Merged

Fix scalafmt formatting #337

merged 3 commits into from
May 26, 2020

Conversation

octonato
Copy link
Contributor

Builds on top of #335.

For some reason, the formatting is not being applied and the test is still passing. This fix it the formatting for now and can be merged after #335.

I will fix the check in #336 since on that PR I'm touching the build i many places.

@octonato octonato changed the title formatting Fix scalafmt formatting May 25, 2020
@octonato
Copy link
Contributor Author

On #335 is merged, I can rebase here and merge. This is ready for review.

Base automatically changed from rgc/branch-merge-1.5-into-master to master May 26, 2020 11:24
@octonato octonato force-pushed the rgc/fix-validate-code branch from 3c7dd84 to fadf9a2 Compare May 26, 2020 11:25
@octonato
Copy link
Contributor Author

Rebased with #335. Ready for review and merge

@octonato octonato marked this pull request as ready for review May 26, 2020 11:25
@octonato octonato force-pushed the rgc/fix-validate-code branch from fadf9a2 to 2e63e5b Compare May 26, 2020 11:41
Comment on lines +3 to +4
align.preset = true
danglingParentheses.preset = true
Copy link
Contributor Author

Choose a reason for hiding this comment

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

just removing some warnings

@@ -2,4 +2,4 @@

# Copyright (C) Lightbend Inc. <https://www.lightbend.com>

sbt ";+validateCode;+mimaReportBinaryIssues" || exit 1
sbt "validateCode;+mimaReportBinaryIssues" || exit 1
Copy link
Contributor Author

Choose a reason for hiding this comment

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

the cross build for validateCode was the issue. This is a command alias.

It was emitting

[warn] Issuing a cross building command, but not all sub projects have the same cross build configuration. This could result in subprojects cross building against Scala versions that they are not compatible with. Try issuing cross building command with tasks instead, since sbt will be able to ensure that cross building is only done using configured project and Scala version combinations that are configured.

and then ignoring the code. We haven't done any formatting for a while in this project.

Copy link
Contributor

@ennru ennru left a comment

Choose a reason for hiding this comment

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

LGTM.

@mergify mergify bot merged commit b56f4c8 into master May 26, 2020
@mergify mergify bot deleted the rgc/fix-validate-code branch May 26, 2020 11:49
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.

2 participants