Reinstate support for KtLint down to 0.31.0 and up to 0.47.1 (inclusive) #1303
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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
force-pushed
the
main-ktlint-versions
branch
from
901d6b1 to
80a209b
Compare
|
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
approved these changes
Aug 30, 2022
|
Nice work! I'd love it to be merged soon! |
mrmans0n
added a commit
to twitter/compose-rules
that referenced
this pull request
Aug 30, 2022
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.
|
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
* 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.
|
Is there anything I can do to help this PR move forward? |
davidburstrom
force-pushed
the
main-ktlint-versions
branch
from
80a209b to
e77ea55
Compare
davidburstrom
changed the title
|
I verified that KtLint 0.47.1 also works. |
|
@davidburstrom Could you please run |
davidburstrom
force-pushed
the
main-ktlint-versions
branch
from
e77ea55 to
3dfb10e
Compare
|
@eirnym Done! Thanks for pointing it out. |
|
Thanks for a great PR, sorry for slow merge. This will be released by tomorrow AM. |
Closed
1 task
|
Released in |
benkard
added a commit
to benkard/mulkcms2
that referenced
this pull request
Jan 14, 2023
…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#​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()`. ([#​1275](diffplug/spotless#1275)) ##### Changes - Bump default `ktfmt` version to latest `0.39` -> `0.40` ([#​1312](diffplug/spotless#1312)) - Bump default `ktlint` version to latest `0.46.1` -> `0.47.1` ([#​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 free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #1281