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

Add support for KtLint 0.48.0 (fixes #1430) #1432

Merged
merged 3 commits into from
Jan 2, 2023

Conversation

davidburstrom
Copy link
Contributor

@davidburstrom davidburstrom commented Dec 20, 2022

No description provided.


// get complete list of supported properties in DefaultEditorConfigProperties.INSTANCE
List<EditorConfigProperty<?>> editorConfigProperties = new ArrayList<>(DefaultEditorConfigProperties.INSTANCE.getEditorConfigProperties());
editorConfigProperties.add(DefaultEditorConfigProperties.INSTANCE.getKtlintDisabledRulesProperty());
Copy link
Contributor

Choose a reason for hiding this comment

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

I think ktlint_disabled_rules has been added to DefaultEditorConfigProperties in 0.48.0, already, so this whole new ArrayList part would be useless now. I introduced it in #1378 for a fix, but if it's in the DefaultEditorConfigProperties we can get rid of it.

Copy link
Member

Choose a reason for hiding this comment

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

Thanks a ton @bcmedeiros for keeping an eye on this. @davidburstrom your call, I'm okay to merge it as-is, or if you want to make the change suggested above first I'm happy to wait.

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'll take a look at the suggested change.

@nedtwigg
Copy link
Member

nedtwigg commented Jan 1, 2023

Needs a spotlessApply. First PR of 2023!

@davidburstrom davidburstrom mentioned this pull request Jan 1, 2023
@nedtwigg nedtwigg enabled auto-merge January 2, 2023 04:16
@nedtwigg nedtwigg merged commit 4063e9f into diffplug:main Jan 2, 2023
@nedtwigg
Copy link
Member

nedtwigg commented Jan 2, 2023

Released in plugin-gradle 6.12.1 and plugin-maven 2.29.0.

@davidburstrom
Copy link
Contributor Author

Thanks for doing the final cleanup!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants