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

Spotless everything #2186

Merged
merged 3 commits into from
Sep 22, 2023
Merged

Spotless everything #2186

merged 3 commits into from
Sep 22, 2023

Conversation

omarismail94
Copy link
Contributor

@omarismail94 omarismail94 commented Sep 19, 2023

IMPORTANT: All PRs must be linked to an issue (except for extremely trivial and straightforward changes).

Fixes #[issue number]

Description
Format our entire project by removing the ratchetFrom setting in the spotless configuration. I think we should keep the config this way so that our files are always up to date with the latest formatting styles

Alternative(s) considered
Have you considered any alternatives? And if so, why have you chosen the approach in this PR?

Type
Choose one: (Bug fix | Feature | Documentation | Testing | Code health | Builds | Releases | Other)

Screenshots (if applicable)

Checklist

  • I have read and acknowledged the Code of conduct.
  • I have read the Contributing page.
  • I have signed the Google Individual CLA, or I am covered by my company's Corporate CLA.
  • I have discussed my proposed solution with code owners in the linked issue(s) and we have agreed upon the general approach.
  • I have run ./gradlew spotlessApply and ./gradlew spotlessCheck to check my code follows the style guide of this project.
  • I have run ./gradlew check and ./gradlew connectedCheck to test my changes locally.
  • I have built and run the demo app(s) to verify my change fixes the issue and/or does not break the demo app(s).

@omarismail94
Copy link
Contributor Author

Removing the ratchetFrom setting, then applying spotless to format all the files, then adding ratchetFrom back does not work. What happens after you add back ratchetFrom is that spotless reverts any of the formatted files that are different from origin/master to their original, unformatted state.

Maybe what we can do is submit the current PR, then send a follow up PR to re-add ratchetFrom. Reading the docs about the license header configuration, having ratchetFrom  is important as it is the feature that updates the license header year when a file is changed

Copy link
Collaborator

@aditya-07 aditya-07 left a comment

Choose a reason for hiding this comment

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

LGTM.

@aditya-07
Copy link
Collaborator

@omarismail94 Could you please update the PR with latest code.

@omarismail94 omarismail94 enabled auto-merge (squash) September 22, 2023 14:26
@omarismail94 omarismail94 merged commit da8e193 into google:master Sep 22, 2023
2 of 3 checks passed
@omarismail94 omarismail94 deleted the spotty branch September 22, 2023 15:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Complete
Development

Successfully merging this pull request may close these issues.

2 participants