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.

Sign up for GitHub

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

Jump to bottom

Bump ktfmt to 0.21 and add support to Google and Kotlinlang formats #812

Merged
merged 1 commit into from
Mar 5, 2021
Merged

Bump ktfmt to 0.21 and add support to Google and Kotlinlang formats #812

merged 1 commit into from
Mar 5, 2021

Conversation

JavierSegoviaCordoba
Copy link
Contributor

@JavierSegoviaCordoba JavierSegoviaCordoba commented Mar 5, 2021 •
edited
Loading

Manually tested, @cgrushko can you take a look at this PR?

Should getCustomFormattingOptions have a better way to manage ktfmt versioning availability? I was thinking about adding to the Style enum a since property to throw errors.

EDIT:

I added the since property so spotless will throw an exception if the user tries to use a ktfmt version that doesn't have a specific format.

@nedtwigg nedtwigg mentioned this pull request Mar 5, 2021
Closed
nedtwigg
nedtwigg requested changes Mar 5, 2021
View reviewed changes
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.

  • add link to this PR in plugin-gradle/CHANGES.md, and put it under ### Added
  • copy this entry also to plugin-maven/CHANGES.md and CHANGES.md

I noted an optional refactor below. Nice to have but not necessary for a merge-and-release.

plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java Outdated Show resolved Hide resolved
@JavierSegoviaCordoba
Copy link
Contributor Author

@nedtwigg has spotless a way to compare two versions so I can delete the Version class I added?

nedtwigg
nedtwigg requested changes Mar 5, 2021
View reviewed changes
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.

The version check is nice, but needs to be thread-safe.

plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java Outdated Show resolved Hide resolved
lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java Outdated Show resolved Hide resolved
lib/src/main/java/com/diffplug/spotless/kotlin/Version.java Outdated Show resolved Hide resolved
nedtwigg
nedtwigg requested changes Mar 5, 2021
View reviewed changes
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.

Still missing an entry in the root CHANGES.md. Once that gets done I think this is ready to merge and release.

@nedtwigg nedtwigg merged commit 72aa24a into diffplug:main Mar 5, 2021
@nedtwigg
Copy link
Member

nedtwigg commented Mar 5, 2021

Released in plugin-gradle 5.11.0 and plugin-maven 2.9.0

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nedtwigg nedtwigg Awaiting requested review from nedtwigg

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@JavierSegoviaCordoba @nedtwigg