Skip to content

Reinstate support for KtLint down to 0.31.0 and up to 0.47.1 (inclusive) - #1303

Merged
nedtwigg merged 7 commits into
diffplug:mainfrom
davidburstrom:main-ktlint-versions
Sep 14, 2022
Merged

Reinstate support for KtLint down to 0.31.0 and up to 0.47.1 (inclusive)#1303
nedtwigg merged 7 commits into
diffplug:mainfrom
davidburstrom:main-ktlint-versions

Conversation

@davidburstrom

@davidburstromdavidburstrom commented Aug 29, 2022•
edited
Loading

Copy link
Copy Markdown
Contributor

Fixes#1281

@davidburstrom
Reinstate support for KtLint down to 0.31.0
8c59a06
The io.github.davidburstrom.version-compatibility plugin provides sourcesets that make it possible
to write adapters against specific versions of KtLint, and the correct adapter will be selected
during runtime.
@davidburstrom

davidburstrom commented Aug 29, 2022

Copy link
Copy Markdown
ContributorAuthor

I recommend reviewing this commit by commit. Let me know if I've missed something, this is the first time I'm contributing to Spotless.

@eirnym

eirnym commented Aug 30, 2022

Copy link
Copy Markdown
Contributor

Nice work! I'd love it to be merged soon!

@eirnymeirnym mentioned this pull request Aug 30, 2022
Closed
mrmans0n added a commit to twitter/compose-rules that referenced this pull request Aug 30, 2022
@mrmans0n
Migrate to ktlint 0.47.0
437ce88
There are a bunch of [breaking API changes](https://github.com/pinterest/ktlint/releases/tag/0.47.0) in the newest version of ktlint. Basically all rulesets need to be redefined. In 0.47.0 versions the previous ruleset versions coexist with the newers, so I added support for both in the mean time. In the future, the previous version of the rulesets will disappear. Also, undocumented by the migration guide, but all tests changed the way in which the assertThat classes are created, so I also updated all the tests to support the new version.
Spotless is not yet compatible with 0.47.0, so I disabled the checks until it is (will likely [land soon](diffplug/spotless#1303)).
I also updated all dependencies.
@mrmans0nmrmans0n mentioned this pull request Aug 30, 2022
Merged
@davidburstrom

davidburstrom commented Aug 30, 2022

Copy link
Copy Markdown
ContributorAuthor

Yeah, I'd love to merge it but I need to have workflows approved first :)

mrmans0n added a commit to twitter/compose-rules that referenced this pull request Aug 30, 2022
@mrmans0n
Migrate to ktlint 0.47.0 (#24)
3e15800
* Migrate to ktlint 0.47.0
There are a bunch of [breaking API changes](https://github.com/pinterest/ktlint/releases/tag/0.47.0) in the newest version of ktlint. Basically all rulesets need to be redefined. In 0.47.0 versions the previous ruleset versions coexist with the newers, so I added support for both in the mean time. In the future, the previous version of the rulesets will disappear. Also, undocumented by the migration guide, but all tests changed the way in which the assertThat classes are created, so I also updated all the tests to support the new version.
Spotless is not yet compatible with 0.47.0, so I disabled the checks until it is (will likely [land soon](diffplug/spotless#1303)).
I also updated all dependencies.
@davidburstrom

davidburstrom commented Sep 6, 2022

Copy link
Copy Markdown
ContributorAuthor

Is there anything I can do to help this PR move forward?

@eirnymeirnym mentioned this pull request Sep 8, 2022
Closed
@davidburstromdavidburstrom changed the title Reinstate support for KtLint down to 0.31.0 and up to 0.47.0 (inclusive)Reinstate support for KtLint down to 0.31.0 and up to 0.47.1 (inclusive)Sep 9, 2022
@davidburstrom

davidburstrom commented Sep 9, 2022

Copy link
Copy Markdown
ContributorAuthor

I verified that KtLint 0.47.1 also works.

@hestadhestad mentioned this pull request Sep 9, 2022
Closed
@eirnym

eirnym commented Sep 10, 2022

Copy link
Copy Markdown
Contributor

@davidburstrom Could you please run spotlessApply to make sure build passes?

@davidburstrom

davidburstrom commented Sep 12, 2022

Copy link
Copy Markdown
ContributorAuthor

@eirnym Done! Thanks for pointing it out.

@nedtwigg

nedtwigg commented Sep 14, 2022

Copy link
Copy Markdown
Member

Thanks for a great PR, sorry for slow merge. This will be released by tomorrow AM.

@nedtwiggnedtwigg mentioned this pull request Sep 14, 2022
Closed
1 task
@nedtwigg
nedtwigg merged commit aadeaef into diffplug:mainSep 14, 2022
@nedtwigg

nedtwigg commented Sep 14, 2022

Copy link
Copy Markdown
Member

Released in plugin-gradle 6.11.0 and plugin-maven 2.26.0.

@davidburstromdavidburstrom mentioned this pull request Oct 14, 2022
Closed
benkard added a commit to benkard/mulkcms2 that referenced this pull request Jan 14, 2023
@benkard
Update dependency com.diffplug.spotless:spotless-maven-plugin to v2.3…
69967e8
…0.0 (mulk/mulkcms2!6)
This MR contains the following updates:
| Package | Type | Update | Change |
|---|---|---|---|
| [com.diffplug.spotless:spotless-maven-plugin](https://github.com/diffplug/spotless) | build | minor | `2.29.0` -> `2.30.0` |
---
### Release Notes
<details>
<summary>diffplug/spotless</summary>
### [`v2.30.0`](https://github.com/diffplug/spotless/blob/HEAD/CHANGES.md#&#8203;2300---2022-09-14)
##### Added
- `formatAnnotations()` step to correct formatting of Java type annotations. It puts type annotations on the same line as the type that they qualify. Run it after a Java formatting step, such as `googleJavaFormat()`. ([#&#8203;1275](diffplug/spotless#1275))
##### Changes
- Bump default `ktfmt` version to latest `0.39` -> `0.40` ([#&#8203;1312](diffplug/spotless#1312))
- Bump default `ktlint` version to latest `0.46.1` -> `0.47.1` ([#&#8203;1303](diffplug/spotless#1303))
- Also restored support for older versions of ktlint back to `0.31.0`
</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 freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer
@eirnymeirnymeirnym approved these changes
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.

Ktlint 0.47.0 not supported

3 participants

@davidburstrom@eirnym@nedtwigg