diff --git a/.editorconfig b/.editorconfig index 0d7fd92cf..5f2e1db4a 100644 --- a/.editorconfig +++ b/.editorconfig @@ -487,16 +487,12 @@ kotlin_imports_layout = *,java.**,javax.**,kotlin.**,^ # test methods with descriptive names. ktlint_ignore_back_ticked_identifier = true -# ktlint_code_style = official -ktlint_function_signature_body_expression_wrapping = default -ktlint_function_signature_rule_force_multiline_when_parameter_count_greater_or_equal_than = 3 +ktlint_code_style = intellij_idea -ktlint_experimental_class-naming = disabled -ktlint_experimental_function-naming = disabled -ktlint_experimental_function-signature = disabled -ktlint_experimental_property-naming = disabled ktlint_standard_class-naming = disabled +ktlint_standard_class-signature = disabled ktlint_standard_filename = disabled +ktlint_standard_function-expression-body = disabled ktlint_standard_function-naming = disabled ktlint_standard_function-signature = disabled ktlint_standard_max-line-length = disabled @@ -504,6 +500,11 @@ ktlint_standard_no-empty-first-line-in-method-block = disabled ktlint_standard_property-naming = disabled ktlint_standard_trailing-comma-on-call-site = disabled ktlint_standard_trailing-comma-on-declaration-site = disabled +ktlint_standard_type-parameter-list-spacing = disabled +ktlint_standard_value-parameter-comment = disabled + +ktlint_function_signature_body_expression_wrapping = default +ktlint_function_signature_rule_force_multiline_when_parameter_count_greater_or_equal_than = 3 [{*.kt,*.kts}] ij_continuation_indent_size = 2 diff --git a/dependencies/classpath.txt b/dependencies/classpath.txt index 0ea8b7294..c20c6e2e6 100644 --- a/dependencies/classpath.txt +++ b/dependencies/classpath.txt @@ -70,9 +70,10 @@ com.google.protobuf:protobuf-java:3.19.3 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.kgx:kotlin-gradle-extensions:0.1.6 -com.rickbusarow.ktlint:com.rickbusarow.ktlint.gradle.plugin:0.1.8 -com.rickbusarow.ktlint:ktlint-gradle-plugin:0.1.8 +com.rickbusarow.kgx:kotlin-gradle-extensions:0.1.9 +com.rickbusarow.kgx:names:0.1.9 +com.rickbusarow.ktlint:com.rickbusarow.ktlint.gradle.plugin:0.2.2 +com.rickbusarow.ktlint:ktlint-gradle-plugin:0.2.2 com.squareup.moshi:moshi-adapters:1.15.0 com.squareup.moshi:moshi:1.15.0 com.squareup.okhttp3:okhttp:4.11.0 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a55133318..b591d48b4 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -61,7 +61,7 @@ kotlinx-serialization-json = "1.6.0" kotlinx-atomicfu = "0.22.0" ktlint = "0.49.1" -ktlint-gradle = "0.1.8" +ktlint-gradle = "0.2.2" material = "1.3.0" mockito-core = "3.12.4" diff --git a/workflow-core/src/commonMain/kotlin/com/squareup/workflow1/BaseRenderContext.kt b/workflow-core/src/commonMain/kotlin/com/squareup/workflow1/BaseRenderContext.kt index bde325ce9..70e2a86a1 100644 --- a/workflow-core/src/commonMain/kotlin/com/squareup/workflow1/BaseRenderContext.kt +++ b/workflow-core/src/commonMain/kotlin/com/squareup/workflow1/BaseRenderContext.kt @@ -1,5 +1,9 @@ // Type variance issue: https://github.com/square/workflow-kotlin/issues/891 -@file:Suppress("EXPERIMENTAL_API_USAGE") +@file:Suppress( + "EXPERIMENTAL_API_USAGE", + "ktlint:standard:parameter-list-spacing", + "ktlint:standard:parameter-wrapping" +) @file:JvmMultifileClass @file:JvmName("Workflows")