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

fix(ktlint): support ktlint_disabled_rules in 0.47+ #1378

Merged
merged 3 commits into from
Oct 21, 2022

Conversation

bcmedeiros
Copy link
Contributor

A fix for the ktlint_disabled_rules issue reported in #1374.

ktlintDisabledRulesProperty is not enumerated in DefaultEditorConfigProperties.INSTANCE.getEditorConfigProperties() for some reason, so in order to support it in a backwards compatible (down to 0.47) way, we have to manually add it.

Copy link
Member

@nedtwigg nedtwigg left a comment

Choose a reason for hiding this comment

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

Needs two things:

  • changelog entries (all three changelogs)
  • tests are failing

@bcmedeiros
Copy link
Contributor Author

@nedtwigg adjustments made, I hope I got the release notes right. Let me know if you need anything else.

Copy link
Member

@nedtwigg nedtwigg left a comment

Choose a reason for hiding this comment

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

Perfect, thanks very much!

@nedtwigg nedtwigg merged commit 1b35bf9 into diffplug:main Oct 21, 2022
@nedtwigg
Copy link
Member

Published in plugin-gradle 6.12.0 and plugin-maven 2.28.0.

benkard added a commit to benkard/mulkcms2 that referenced this pull request Apr 2, 2023
…1.0 (mulk/mulkcms2!12)

This MR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| [com.diffplug.spotless:spotless-maven-plugin](https://github.com/diffplug/spotless) | build | minor | `2.30.0` -> `2.31.0` |

---

### Release Notes

<details>
<summary>diffplug/spotless</summary>

### [`v2.31.0`](https://github.com/diffplug/spotless/blob/HEAD/CHANGES.md#&#8203;2310---2022-11-24)

##### Added

-   `importOrder` now support groups of imports without blank lines ([#&#8203;1401](diffplug/spotless#1401))

##### Fixed

-   Don't treat `@Value` as a type annotation [#&#8203;1367](diffplug/spotless#1367)
-   Support `ktlint_disabled_rules` in `ktlint` 0.47.x [#&#8203;1378](diffplug/spotless#1378)
-   Share git repositories across projects when using ratchet ([#&#8203;1426](diffplug/spotless#1426))

##### Changes

-   Bump default `ktfmt` version to latest `0.40` -> `0.41` ([#&#8203;1340](diffplug/spotless#1340))
-   Bump default `scalafmt` version to latest `3.5.9` -> `3.6.1` ([#&#8203;1373](diffplug/spotless#1373))
-   Bump default `diktat` version to latest `1.2.3` -> `1.2.4.2` ([#&#8203;1393](diffplug/spotless#1393))
-   Bump default `palantir-java-format` version to latest `2.10` -> `2.28` ([#&#8203;1393](diffplug/spotless#1393))

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Whenever MR is behind base branch, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this MR and you won't be reminded about this update again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this MR, check this box

---

This MR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNC4yNC4wIiwidXBkYXRlZEluVmVyIjoiMzQuMjQuMCJ9-->
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.

2 participants