This repository has been archived by the owner on Feb 11, 2022. It is now read-only.
Fix ktlint for all versions #153
Merged
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
|
I was thinking before that this should be fixed in ktlint. But having a second round of thinking, I found an easy way to support both behaviors of the ktlint plugin. |
mr-archano
reviewed
Dec 6, 2018
plugin/src/main/groovy/com/novoda/staticanalysis/internal/ktlint/KtlintConfigurator.groovy
Outdated
Show resolved
Hide resolved
plugin/src/test/groovy/com/novoda/staticanalysis/internal/ktlint/KtlintIntegrationTest.groovy
Outdated
Show resolved
Hide resolved
tasomaniac
commented
Dec 7, 2018
Looking at sourcesets are enough for configuration.
tasomaniac
force-pushed
the
taso/fix-ktlint-all-versions
branch
from
22f3f40
to
cc13587
Compare
tasomaniac
force-pushed
the
taso/fix-ktlint-all-versions
branch
from
cc13587
to
5ab15b1
Compare
|
Hey @mr-archano, did some changes to support the upcoming ktlint changes. I think this is ready to review and merge. Once they publish the plugin, I will add new tests for Also had a small addition in test to enable the commented out test. |
mr-archano
approved these changes
Dec 17, 2018
| @@ -63,6 +63,13 @@ ${project.additionalConfiguration} | |||
| file.text = text | |||
| } | |||
|
|
|||
| public T copyIntoSourceSet(String sourceSet, File srcDir) { | |||
|
@hal90002 retest this please |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Ktlint integration is fixed for 6.x and upcoming 7.x versions.
For Ktlint integration, we only depend on task names and a certain property (
reportOutputFiles). Extracted taskmatchinginto a function and support resolving the tasks from all versions of ktlint.Tests
6.1.0 is also fixed but has a bug affecting our test setup. I don't think it is worth to fix that only for tests. 6.2.x and 6.3.x are supported.Also enabled tests for
6.1.0version by allowing test fixtures to be copied into the actual test project.