Skip to content

Commit

Permalink
Merge pull request #1022 from square/rick/ktlint_0.1.5
Browse files Browse the repository at this point in the history
update ktlint plugin to `0.1.5` and delete `ktlint_disabled_rules` from .editorconfig
  • Loading branch information
RBusarow authored Jun 14, 2023
2 parents 65ab8c1 + 74ecc77 commit d7ff87f
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 5 deletions.
2 changes: 0 additions & 2 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -506,8 +506,6 @@ ktlint_standard_trailing-comma-on-call-site = disabled
ktlint_standard_trailing-comma-on-declaration-site = disabled

[{*.kt,*.kts}]
# noinspection EditorConfigKeyCorrectness
ktlint_disabled_rules = trailing-comma-on-declaration-site,trailing-comma-on-call-site
ij_continuation_indent_size = 2
ij_kotlin_align_in_columns_case_branch = false
ij_kotlin_align_multiline_binary_operation = false
Expand Down
4 changes: 2 additions & 2 deletions dependencies/classpath.txt
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ com.google.protobuf:protobuf-java:3.17.2
com.google.testing.platform:core-proto:0.0.8-alpha08
com.googlecode.java-diff-utils:diffutils:1.3.0
com.googlecode.juniversalchardet:juniversalchardet:1.0.3
com.rickbusarow.ktlint:com.rickbusarow.ktlint.gradle.plugin:0.1.4
com.rickbusarow.ktlint:ktlint-gradle-plugin:0.1.4
com.rickbusarow.ktlint:com.rickbusarow.ktlint.gradle.plugin:0.1.5
com.rickbusarow.ktlint:ktlint-gradle-plugin:0.1.5
com.squareup.moshi:moshi-adapters:1.13.0
com.squareup.moshi:moshi:1.13.0
com.squareup.okhttp3:okhttp:4.10.0
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ kotlinx-serialization-json = "1.3.2"
kotlinx-atomicfu = "0.17.2"

ktlint = "0.49.1"
ktlint-gradle = "0.1.4"
ktlint-gradle = "0.1.5"
material = "1.3.0"
mavenPublish = "0.13.0"

Expand Down

0 comments on commit d7ff87f

Please sign in to comment.