Skip to content

Commit

Permalink
Update Ktlint to v1.3
Browse files Browse the repository at this point in the history
  • Loading branch information
FloEdelmann committed Jun 5, 2024
1 parent 1f40def commit 26edd59
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
8 changes: 5 additions & 3 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,14 @@ indent_size = 4
ktlint_standard_annotation = disabled
ktlint_standard_argument-list-wrapping = disabled
ktlint_standard_backing-property-naming = disabled
ktlint_standard_binary-expression-wrapping = disabled
ktlint_standard_blank-line-before-declaration = disabled
ktlint_standard_blank-line-between-when-conditions = disabled
ktlint_standard_chain-method-continuation = disabled
ktlint_standard_chain-wrapping = disabled
ktlint_standard_class-signature = disabled
ktlint_standard_condition-wrapping = disabled
ktlint_standard_function-literal = disabled
ktlint_standard_function-naming = disabled
ktlint_standard_function-signature = disabled
ktlint_standard_if-else-wrapping = disabled
Expand Down Expand Up @@ -51,11 +56,8 @@ ktlint_standard_trailing-comma-on-declaration-site = disabled
ktlint_standard_wrapping = disabled

# enable some experimental Ktlint rules
ktlint_standard_function-expression-body = enabled
ktlint_standard_function-type-modifier-spacing = enabled
ktlint_standard_mixed-condition-operators = enabled
ktlint_standard_kdoc = enabled
ktlint_standard_multiline-loop = enabled
ktlint_standard_square-brackets-spacing = enabled

[gradlew]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
id: ktlint-check
uses: musichin/ktlint-check@v3.0.0
with:
ktlint-version: "1.2.1"
ktlint-version: "1.3.0"
reporter: plain?group_by_file,output=${{ env.lintResultFilename }}
relative: true
continue-on-error: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -818,8 +818,6 @@ class SeparateCyclewayCreatorKtTest {
}
}



private fun SeparateCycleway.appliedTo(tags: Map<String, String>): Set<StringMapEntryChange> {
val cb = StringMapChangesBuilder(tags)
applyTo(cb)
Expand Down

0 comments on commit 26edd59

Please sign in to comment.