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

Bump org.jlleitschuh.gradle.ktlint from 11.6.1 to 12.1.0 #4125

Merged

Conversation

dependabot[bot]
Copy link
Contributor

@dependabot dependabot bot commented on behalf of github Jan 10, 2024

Bumps org.jlleitschuh.gradle.ktlint from 11.6.1 to 12.1.0.

Dependabot compatibility score

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.


Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

  • @dependabot rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot merge will merge this PR after your CI passes on it
  • @dependabot squash and merge will squash and merge this PR after your CI passes on it
  • @dependabot cancel merge will cancel a previously requested merge and block automerging
  • @dependabot reopen will reopen this PR if it is closed
  • @dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
  • @dependabot show <dependency name> ignore conditions will show all of the ignore conditions of the specified dependency
  • @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)

@dependabot dependabot bot added dependencies Pull requests that update a dependency file java Pull requests that update Java code major A major change - Bumps major build number labels Jan 10, 2024
@dependabot dependabot bot force-pushed the dependabot/gradle/org.jlleitschuh.gradle.ktlint-12.1.0 branch from 9d4f10b to b6837a4 Compare January 12, 2024 17:40
@dependabot dependabot bot force-pushed the dependabot/gradle/org.jlleitschuh.gradle.ktlint-12.1.0 branch from b6837a4 to 9bdbc22 Compare January 25, 2024 21:18
@jpelgrom
Copy link
Member

jpelgrom commented Feb 6, 2024

I have this building passing locally but want to disable the following rules in a .editorconfig file because they make little sense in my opinion (and cannot be fixed automatically):

  • function names should always use camel case - disable for functions annotated with @Composable where this is very uncommon
  • max line length 140 characters - we're over in a lot of places like log statements, and are generally pretty good about keeping files readable

Agreed? If so I'll ask dependabot to rebase and push the required changes to pass in individual commits.

@JBassett
Copy link
Collaborator

JBassett commented Feb 6, 2024

👍 Makes sense.

@dshokouhi
Copy link
Member

sounds good to me too

@jpelgrom
Copy link
Member

jpelgrom commented Feb 6, 2024

@dependabot rebase

Bumps org.jlleitschuh.gradle.ktlint from 11.6.1 to 12.1.0.

---
updated-dependencies:
- dependency-name: org.jlleitschuh.gradle.ktlint
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
@dependabot dependabot bot force-pushed the dependabot/gradle/org.jlleitschuh.gradle.ktlint-12.1.0 branch from 9bdbc22 to d90d102 Compare February 6, 2024 18:45
@jpelgrom
Copy link
Member

jpelgrom commented Feb 6, 2024

One final addition to .editorconfig after reviewing what ktlint did: telling it this is Android code, which previously it understood and now it didn't. Without it almost all classes were indented because of the use of @Inject annotations being put on a new line - same argument as the @Composable annotation applies here in my opinion.

Down from +21k/-17k to a few hundred lines of changed code.

Edit: after reading more, it seems that these changes are due to switching to a completely new code style (previously it only added a few rules on top of the existing code style) instead of not understanding things. Still, I think it's worth it to deviate/maintain the current code style for readability and to keep a useful Git history, otherwise basically every line is changed.

Edit 2: "maintain the current code style" would actually be intellij_idea and add trailing commas everywhere. Also reasonable in my opinion.

@JBassett JBassett merged commit 15b1518 into master Feb 7, 2024
4 checks passed
@JBassett JBassett deleted the dependabot/gradle/org.jlleitschuh.gradle.ktlint-12.1.0 branch February 7, 2024 02:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cla-signed dependencies Pull requests that update a dependency file java Pull requests that update Java code major A major change - Bumps major build number
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants