Skip to content

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

Merged
nedtwigg merged 3 commits into
diffplug:mainfrom
davidburstrom:main-ktlint-0.48.0
Jan 2, 2023
Merged

Add support for KtLint 0.48.0 (fixes #1430)#1432
nedtwigg merged 3 commits into
diffplug:mainfrom
davidburstrom:main-ktlint-0.48.0

Conversation

@davidburstrom

@davidburstromdavidburstrom commented Dec 20, 2022•
edited
Loading

Copy link
Copy Markdown
Contributor

No description provided.

@eirnymeirnym mentioned this pull request Dec 24, 2022
Closed
@bcmedeirosbcmedeiros mentioned this pull request Dec 28, 2022
Closed
bcmedeiros
bcmedeiros reviewed Dec 28, 2022
View reviewed changes
Comment thread...t0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java Outdated

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

@bcmedeirosbcmedeirosDec 28, 2022

Copy link
Copy Markdown
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.

@nedtwiggnedtwiggDec 31, 2022

Copy link
Copy Markdown
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.

@davidburstromdavidburstromJan 1, 2023

Copy link
Copy Markdown
ContributorAuthor

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

nedtwigg commented Jan 1, 2023

Copy link
Copy Markdown
Member

Needs a spotlessApply. First PR of 2023!

@davidburstromdavidburstrom mentioned this pull request Jan 1, 2023
Closed
@nedtwigg
nedtwigg enabled auto-merge January 2, 2023 04:16
@nedtwigg
nedtwigg merged commit 4063e9f into diffplug:mainJan 2, 2023
@nedtwigg

nedtwigg commented Jan 2, 2023

Copy link
Copy Markdown
Member

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

@davidburstrom

davidburstrom commented Jan 2, 2023

Copy link
Copy Markdown
ContributorAuthor

Thanks for doing the final cleanup!

@nedtwiggnedtwigg mentioned this pull request Jan 2, 2023
Closed
4 tasks
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@nedtwiggnedtwiggnedtwigg left review comments
+1 more reviewer
@bcmedeirosbcmedeirosbcmedeiros left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@davidburstrom@nedtwigg@bcmedeiros