Skip to content

Commit 97bfeb6

Browse files
authored
Merge pull request #1162 from square/renovate/ktlint.gradle
Update ktlint.gradle to v0.2.2
2 parents da0930a + d4ef796 commit 97bfeb6

File tree

4 files changed

+18
-12
lines changed

4 files changed

+18
-12
lines changed

.editorconfig

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -487,23 +487,24 @@ kotlin_imports_layout = *,java.**,javax.**,kotlin.**,^
487487
# test methods with descriptive names.
488488
ktlint_ignore_back_ticked_identifier = true
489489

490-
# ktlint_code_style = official
491-
ktlint_function_signature_body_expression_wrapping = default
492-
ktlint_function_signature_rule_force_multiline_when_parameter_count_greater_or_equal_than = 3
490+
ktlint_code_style = intellij_idea
493491

494-
ktlint_experimental_class-naming = disabled
495-
ktlint_experimental_function-naming = disabled
496-
ktlint_experimental_function-signature = disabled
497-
ktlint_experimental_property-naming = disabled
498492
ktlint_standard_class-naming = disabled
493+
ktlint_standard_class-signature = disabled
499494
ktlint_standard_filename = disabled
495+
ktlint_standard_function-expression-body = disabled
500496
ktlint_standard_function-naming = disabled
501497
ktlint_standard_function-signature = disabled
502498
ktlint_standard_max-line-length = disabled
503499
ktlint_standard_no-empty-first-line-in-method-block = disabled
504500
ktlint_standard_property-naming = disabled
505501
ktlint_standard_trailing-comma-on-call-site = disabled
506502
ktlint_standard_trailing-comma-on-declaration-site = disabled
503+
ktlint_standard_type-parameter-list-spacing = disabled
504+
ktlint_standard_value-parameter-comment = disabled
505+
506+
ktlint_function_signature_body_expression_wrapping = default
507+
ktlint_function_signature_rule_force_multiline_when_parameter_count_greater_or_equal_than = 3
507508

508509
[{*.kt,*.kts}]
509510
ij_continuation_indent_size = 2

dependencies/classpath.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,10 @@ com.google.protobuf:protobuf-java:3.19.3
7070
com.google.testing.platform:core-proto:0.0.8-alpha08
7171
com.googlecode.java-diff-utils:diffutils:1.3.0
7272
com.googlecode.juniversalchardet:juniversalchardet:1.0.3
73-
com.rickbusarow.kgx:kotlin-gradle-extensions:0.1.6
74-
com.rickbusarow.ktlint:com.rickbusarow.ktlint.gradle.plugin:0.1.8
75-
com.rickbusarow.ktlint:ktlint-gradle-plugin:0.1.8
73+
com.rickbusarow.kgx:kotlin-gradle-extensions:0.1.9
74+
com.rickbusarow.kgx:names:0.1.9
75+
com.rickbusarow.ktlint:com.rickbusarow.ktlint.gradle.plugin:0.2.2
76+
com.rickbusarow.ktlint:ktlint-gradle-plugin:0.2.2
7677
com.squareup.moshi:moshi-adapters:1.15.0
7778
com.squareup.moshi:moshi:1.15.0
7879
com.squareup.okhttp3:okhttp:4.11.0

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ kotlinx-serialization-json = "1.6.0"
6161
kotlinx-atomicfu = "0.22.0"
6262

6363
ktlint = "0.49.1"
64-
ktlint-gradle = "0.1.8"
64+
ktlint-gradle = "0.2.2"
6565
material = "1.3.0"
6666

6767
mockito-core = "3.12.4"

workflow-core/src/commonMain/kotlin/com/squareup/workflow1/BaseRenderContext.kt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
// Type variance issue: https://github.com/square/workflow-kotlin/issues/891
2-
@file:Suppress("EXPERIMENTAL_API_USAGE")
2+
@file:Suppress(
3+
"EXPERIMENTAL_API_USAGE",
4+
"ktlint:standard:parameter-list-spacing",
5+
"ktlint:standard:parameter-wrapping"
6+
)
37
@file:JvmMultifileClass
48
@file:JvmName("Workflows")
59

0 commit comments

Comments
 (0)