From ff36c461b50c75248d22ae421478226729c321a8 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Mon, 17 Apr 2023 15:17:44 +0200 Subject: [PATCH] Upgrade ktlint to 0.48.2 --- .editorconfig | 5 +++ build.gradle.kts | 35 +++---------------- gradle/libs.versions.toml | 3 +- .../coroutine/{pmap.kt => ParallelMap.kt} | 0 .../libraries/statemachine/StateMachine.kt | 4 +-- 5 files changed, 13 insertions(+), 34 deletions(-) rename libraries/core/src/main/kotlin/io/element/android/libraries/core/coroutine/{pmap.kt => ParallelMap.kt} (100%) diff --git a/.editorconfig b/.editorconfig index 26bef415d7..3682168027 100644 --- a/.editorconfig +++ b/.editorconfig @@ -14,6 +14,11 @@ ij_smart_tabs = false ij_visual_guides = none ij_wrap_on_typing = false +# Ktlint rule, for more information see https://pinterest.github.io/ktlint/faq/#why-is-editorconfig-property-disabled_rules-deprecated-and-how-do-i-resolve-this +ktlint_standard_wrapping = disabled +ktlint_standard_trailing-comma-on-call-site = disabled + + [*.java] ij_java_align_consecutive_assignments = false ij_java_align_consecutive_variable_declarations = false diff --git a/build.gradle.kts b/build.gradle.kts index a0b50c1e84..eb47692c85 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -70,8 +70,8 @@ allprojects { // See https://github.com/JLLeitschuh/ktlint-gradle#configuration configure { // See https://github.com/pinterest/ktlint/releases/ - // TODO 0.47.1 is available - version.set("0.45.1") + // TODO Regularly check for new version here ^ + version.set("0.48.2") android.set(true) ignoreFailures.set(false) enableExperimentalRules.set(true) @@ -85,33 +85,6 @@ allprojects { filter { exclude { element -> element.file.path.contains("$buildDir/generated/") } } - disabledRules.set( - setOf( - // TODO Re-enable these 4 rules after reformatting project - "indent", - "experimental:argument-list-wrapping", - "max-line-length", - "parameter-list-wrapping", - - "spacing-between-declarations-with-comments", - "no-multi-spaces", - "experimental:spacing-between-declarations-with-annotations", - "experimental:annotation", - // - Missing newline after "(" - // - Missing newline before ")" - "wrapping", - // - Unnecessary trailing comma before ")" - "experimental:trailing-comma", - // - A block comment in between other elements on the same line is disallowed - "experimental:comment-wrapping", - // - A KDoc comment after any other element on the same line must be separated by a new line - "experimental:kdoc-wrapping", - // Ignore error "Redundant curly braces", since we use it to fix false positives, for instance in "elementLogs.${i}.txt" - "string-template", - // Not the same order than Android Studio formatter... - "import-ordering", - ) - ) } // Dependency check apply { @@ -283,7 +256,9 @@ val ciBuildProperty = "ci-build" val isCiBuild = if (project.hasProperty(ciBuildProperty)) { val raw = project.property(ciBuildProperty) as? String raw?.toBooleanLenient() == true || raw?.toIntOrNull() == 1 -} else false +} else { + false +} if (isCiBuild) { allprojects { afterEvaluate { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 452af8a9d0..15af29cecd 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -48,7 +48,6 @@ anvil = "2.4.4" # quality detekt = "1.22.0" -ktlint = "11.3.1" dependencygraph = "0.10" [libraries] @@ -159,7 +158,7 @@ kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" } ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } anvil = { id = "com.squareup.anvil", version.ref = "anvil" } detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" } -ktlint = { id = "org.jlleitschuh.gradle.ktlint", version.ref = "ktlint" } +ktlint = "org.jlleitschuh.gradle.ktlint:11.3.1" dependencygraph = { id = "com.savvasdalkitsis.module-dependency-graph", version.ref = "dependencygraph" } dependencycheck = { id = "org.owasp.dependencycheck", version.ref = "dependencycheck" } paparazzi = "app.cash.paparazzi:1.2.0" diff --git a/libraries/core/src/main/kotlin/io/element/android/libraries/core/coroutine/pmap.kt b/libraries/core/src/main/kotlin/io/element/android/libraries/core/coroutine/ParallelMap.kt similarity index 100% rename from libraries/core/src/main/kotlin/io/element/android/libraries/core/coroutine/pmap.kt rename to libraries/core/src/main/kotlin/io/element/android/libraries/core/coroutine/ParallelMap.kt diff --git a/libraries/statemachine/src/main/kotlin/io/element/android/libraries/statemachine/StateMachine.kt b/libraries/statemachine/src/main/kotlin/io/element/android/libraries/statemachine/StateMachine.kt index c1620fd97e..ccb98e0563 100644 --- a/libraries/statemachine/src/main/kotlin/io/element/android/libraries/statemachine/StateMachine.kt +++ b/libraries/statemachine/src/main/kotlin/io/element/android/libraries/statemachine/StateMachine.kt @@ -64,7 +64,7 @@ class StateMachine( val routesForEvent = routes.filter { it.eventType.isInstance(event) } return (routesForEvent.firstOrNull { it.fromState?.isInstance(currentState) == true } - ?: routesForEvent.firstOrNull { it.fromState == null }) as? StateMachineRoute + ?: routesForEvent.firstOrNull { it.fromState == null }) as? StateMachineRoute } fun restart() { @@ -129,7 +129,7 @@ class StateMachineBuilder( newRoutes: List>, ) { val oldEvents = oldRoutes.filter { it.fromState == state }.map { it.eventType } - val newEvents = newRoutes.filter { it.fromState == state }.map { it.eventType } + val newEvents = newRoutes.filter { it.fromState == state }.map { it.eventType } val intersection = oldEvents.intersect(newEvents) if (intersection.isNotEmpty()) { val duplicates = intersection.joinToString(", ") { it.name }