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.

Sign up for GitHub

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

Jump to bottom

Use Spotless #637

Merged
merged 3 commits into from
May 12, 2023
Merged

Use Spotless #637

merged 3 commits into from
May 12, 2023

Conversation

veyndan
Copy link
Contributor

@veyndan veyndan commented Aug 9, 2022

Closes #516.

@veyndan veyndan requested a review from swankjesse August 9, 2022 12:23
veyndan
veyndan commented Aug 9, 2022
View reviewed changes
.git-blame-ignore-revs Outdated
@@ -0,0 +1,2 @@
# Run './gradlew spotlessApply'
2341806496ba2f23532a42775c4ef53b965e07c0
Copy link
Contributor Author

@veyndan veyndan Aug 9, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

Important: Don't squash or rebase when merging as that'll invalidate this rev.

build.gradle.kts Outdated
.editorConfigOverride(
mapOf(
"indent_size" to "2",
"disabled_rules" to "filename, no-unused-imports, indent, comment-spacing",
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I just disabled these rules as they were causing some issues. They can be enabled in some follow up PRs.

swankjesse
swankjesse approved these changes Aug 10, 2022
View reviewed changes
.git-blame-ignore-revs
@@ -0,0 +1,2 @@
# Run './gradlew spotlessApply'
Copy link
Collaborator

Choose a reason for hiding this comment

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

NEAT

@veyndan veyndan force-pushed the veyndan/2022-08-09/spotless branch 3 times, most recently from bbe6ee9 to 4dae215 Compare August 11, 2022 10:34
@veyndan veyndan changed the title Use Spotless Use Kotlinter Aug 11, 2022
@veyndan veyndan force-pushed the veyndan/2022-08-09/spotless branch from 4dae215 to 3e4d8c2 Compare August 11, 2022 11:37
@JakeWharton
Copy link
Collaborator

@veyndan you want me to help push this over the line?

@veyndan veyndan force-pushed the veyndan/2022-08-09/spotless branch from a7b8cce to 7b43828 Compare August 19, 2022 11:31
@veyndan
Copy link
Contributor Author

veyndan commented Aug 19, 2022

That'd be super helpful. I've been meaning to get to this but I realistically won't have time in the next week or so. Judging by the error it looks like the build folder is being linted as well, so just need to somehow ignore the folder.

@veyndan veyndan force-pushed the veyndan/2022-08-09/spotless branch from 7b43828 to 6024805 Compare September 19, 2022 13:05
@veyndan
Copy link
Contributor Author

veyndan commented Sep 19, 2022

@JakeWharton What are your opinions on getting this merged? Going through https://pinterest.github.io/ktlint/install/integrations/#gradle-integration, it looks like they all have some sort of problem:

I'm thinking we just revert back to Spotless (as we use it elsewhere) and then just migrate to another tool once any of the above issues are fixed.

@veyndan veyndan changed the title Use Kotlinter Use Spotless Jan 16, 2023
@veyndan veyndan force-pushed the veyndan/2022-08-09/spotless branch from 6024805 to e1c88ed Compare May 12, 2023 11:27
@veyndan veyndan enabled auto-merge (squash) May 12, 2023 11:27
@veyndan veyndan disabled auto-merge May 12, 2023 11:28
@veyndan veyndan enabled auto-merge May 12, 2023 11:29
@veyndan veyndan disabled auto-merge May 12, 2023 11:34
@veyndan veyndan force-pushed the veyndan/2022-08-09/spotless branch from e1c88ed to 92873f4 Compare May 12, 2023 11:58
@veyndan veyndan enabled auto-merge May 12, 2023 12:02
@veyndan veyndan force-pushed the veyndan/2022-08-09/spotless branch from 92873f4 to a88527f Compare May 12, 2023 13:27
@veyndan veyndan merged commit 0925968 into trunk May 12, 2023
@veyndan veyndan deleted the veyndan/2022-08-09/spotless branch May 12, 2023 14:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@swankjesse swankjesse swankjesse approved these changes

@JakeWharton JakeWharton JakeWharton approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Use Spotless
3 participants
@veyndan @JakeWharton @swankjesse