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

Apply scalafmt #2246

Merged
merged 3 commits into from
Jan 11, 2022
Merged

Apply scalafmt #2246

merged 3 commits into from
Jan 11, 2022

Conversation

sequencer
Copy link
Member

Time(Clean up before 3.5) to apply scalafmt!

@jackkoenig
Copy link
Contributor

@sequencer I've pushed over this. I integrated your 3 commits into 1 (adding the ability to run scalafmt), then there are 2 more commits: 1) Running scalafmt on everything, and 2) turning the check on in CI.

This is failing Mergify because some features were deprecated and removed so we need to fix that before we can merge any PRs now....

@jackkoenig
Copy link
Contributor

Note that this must be merged with a merge commit because we need different commits for making it possible to run scalafmt and actually running it. Separating these commits allows people to more easily update branches from before the formatting was applied without massive merge conflicts. The process is as follows:

  1. Rebase (or merge) branch on commit where scalafmt was added
  2. Run scalafmtAll
  3. Rebase (or merge) on master

Voila, merge conflicts have been avoided.

@jackkoenig jackkoenig added the Merge with merge commit Please merge with a merge commit, do not squash and merg label Jan 10, 2022
sequencer and others added 3 commits January 10, 2022 15:53
Can be run in two ways:
* sbt scalaFmtAll
* mill mill.scalalib.scalafmt.ScalafmtModule/reformatAll __.sources
Command:
sbt scalafmtAll
@jackkoenig jackkoenig enabled auto-merge January 11, 2022 00:03
@jackkoenig jackkoenig merged commit 2b48fd1 into master Jan 11, 2022
@jackkoenig jackkoenig deleted the scalafmt branch January 11, 2022 00:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Merge with merge commit Please merge with a merge commit, do not squash and merg
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants