Skip to content

Commit cf3bcf7

Browse files
authored
fix "additionalEditorconfig not supported until ktlint 0.49" warning when additionalEditorconfig is not being used (#712)
1 parent 23d0c9e commit cf3bcf7

File tree

3 files changed

+4
-0
lines changed

3 files changed

+4
-0
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/).
77

88
## [Unreleased]
99

10+
- fix "additionalEditorconfig not supported until ktlint 0.49" warning [#712](https://github.com/JLLeitschuh/ktlint-gradle/pull/712)
1011
- update latest version text file manually [#709](https://github.com/JLLeitschuh/ktlint-gradle/pull/709)
1112
- Improve error logging [#711](https://github.com/JLLeitschuh/ktlint-gradle/pull/711)
1213

plugin/src/main/kotlin/org/jlleitschuh/gradle/ktlint/worker/KtLintWorkAction.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ abstract class KtLintWorkAction : WorkAction<KtLintWorkAction.KtLintWorkParamete
4040
logger.warn("additionalEditorconfigFile no longer supported in ktlint 0.47+")
4141
}
4242
if (parameters.additionalEditorconfig.isPresent &&
43+
parameters.additionalEditorconfig.get().isNotEmpty() &&
4344
parameters.ktLintVersion.map { SemVer.parse(it) }.get() < SemVer(0, 49)
4445
) {
4546
logger.warn("additionalEditorconfig not supported until ktlint 0.49")

plugin/src/test/kotlin/org/jlleitschuh/gradle/ktlint/KtLintSupportedVersionsTest.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,10 +94,12 @@ class KtLintSupportedVersionsTest : AbstractPluginTest() {
9494
buildAndFail(CHECK_PARENT_TASK_NAME) {
9595
assertThat(task(":$mainSourceSetCheckTaskName")?.outcome).isEqualTo(TaskOutcome.FAILED)
9696
assertThat(output).contains("additionalEditorconfigFile no longer supported in ktlint 0.47+")
97+
assertThat(output).doesNotContain("additionalEditorconfig not supported until ktlint 0.49")
9798
}
9899
} else {
99100
build(CHECK_PARENT_TASK_NAME) {
100101
assertThat(task(":$mainSourceSetCheckTaskName")?.outcome).isEqualTo(TaskOutcome.SUCCESS)
102+
assertThat(output).doesNotContain("additionalEditorconfig not supported until ktlint 0.49")
101103
}
102104
}
103105
}

0 commit comments

Comments
 (0)