-
Notifications
You must be signed in to change notification settings - Fork 1k
[WIP] Use Spotless for Kotlin formatting #6420
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
Draft
mikescamell
wants to merge
7
commits into
develop
Choose a base branch
from
feature/mike/remove-kotlinter
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
daxmobile
reviewed
Jul 18, 2025
daxmobile
reviewed
Jul 18, 2025
daxmobile
reviewed
Jul 18, 2025
daxmobile
reviewed
Jul 18, 2025
daxmobile
reviewed
Jul 18, 2025
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🚫 [actionlint] reported by reviewdog 🐶
shellcheck reported issue in this script: SC2002:style:1:5: Useless cat. Consider 'cmd < file | ..' or 'cmd file | ..' instead [shellcheck]
Android/.github/workflows/ci.yml
Line 189 in 33a5226
run: cat build/fladle/fladleResults/HtmlErrorReport.html | cut -d\` -f2 >> results.json |
daxmobile
reviewed
Jul 18, 2025
daxmobile
reviewed
Jul 18, 2025
ratchetFrom means Spotless will apply only to files which have changed since origin/main It also means we need to make some changes to CI due to ensure builds pass due to shallow clones. See https://github.com/diffplug/spotless/tree/main/plugin-gradle#using-ratchetfrom-on-ci-systems for more details.
Spotless breaks because we have classes and files that have been commited that should technically be ignored by our .gitignore settings. See diffplug/spotless#911 (comment) Therefore we have to either remove these files or move them. In this case the DeviceShield stuff was in a package called "report" which we ignore in .gitignore. Therefore I gave it a new package name We want to keep the icon and I guess we want to keep the copyright folder so I made that work in .gitignore
As these have "changed" since develop then they need formatting!
33a5226
to
4d354fc
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Task/Issue URL:
Description
WIP until Spotless gets worktree support diffplug/spotless#2375
Steps to test this PR
Feature 1
UI changes