commit 371f2666ef4df17d576e17f378f461fd566ca0ef parent 655ba8eacaaa7c37d257b7bdd58f43b65e8e13b3 Author: Ryan VanderMeulen <rvandermeulen@mozilla.com> Date: Sat, 6 Dec 2025 16:45:07 +0000 Bug 2003775 - Update ktlint to version 1.8.0. r=android-reviewers,mcarare Differential Revision: https://phabricator.services.mozilla.com/D274966 Diffstat:
5 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml @@ -73,7 +73,7 @@ tomlj = "1.1.1" # Linters detekt = "1.23.8" google-java-format = "1.28.0" -ktlint = "1.7.1" +ktlint = "1.8.0" spotless = "8.1.0" # Mozilla diff --git a/mobile/android/android-components/.editorconfig b/mobile/android/android-components/.editorconfig @@ -35,6 +35,10 @@ ktlint_standard_string-template-indent = disabled ktlint_standard_if-else-wrapping = disabled ktlint_standard_multiline-if-else = disabled +# disabled rules after 1.8.0 upgrade +ktlint_standard_blank-line-between-when-conditions = disabled +ktlint_standard_when-entry-bracing = disabled + # rules that enforce style we don't want ktlint_standard_backing-property-naming = disabled # it would force making backed properties public. ktlint_standard_expression-operand-wrapping = disabled # noisy and doesn't improve readability much diff --git a/mobile/android/fenix/.editorconfig b/mobile/android/fenix/.editorconfig @@ -28,6 +28,9 @@ ktlint_standard_property-wrapping = disabled ktlint_standard_no-empty-first-line-in-class-body = disabled ktlint_standard_if-else-wrapping = disabled +# disabled rules after 1.8.0 upgrade +ktlint_standard_blank-line-between-when-conditions = disabled +ktlint_standard_when-entry-bracing = disabled # rules that enforce style we don't want ktlint_standard_backing-property-naming = disabled # it would force making backed properties public. diff --git a/mobile/android/focus-android/.editorconfig b/mobile/android/focus-android/.editorconfig @@ -23,6 +23,10 @@ ktlint_standard_if-else-wrapping = disabled ktlint_standard_no-blank-line-in-list = disabled ktlint_standard_condition-wrapping = disabled +# disabled rules after 1.8.0 upgrade +ktlint_standard_blank-line-between-when-conditions = disabled +ktlint_standard_when-entry-bracing = disabled + # rules that enforce style we don't want ktlint_standard_backing-property-naming = disabled # it would force making backed properties public. ktlint_standard_expression-operand-wrapping = disabled # noisy and doesn't improve readability much diff --git a/mobile/android/geckoview/.editorconfig b/mobile/android/geckoview/.editorconfig @@ -21,6 +21,10 @@ ktlint_standard_property-naming = disabled ktlint_standard_statement-wrapping = disabled ktlint_standard_string-template-indent = disabled +# disabled rules after 1.8.0 upgrade +ktlint_standard_blank-line-between-when-conditions = disabled +ktlint_standard_when-entry-bracing = disabled + # The following rules are different from the other projects ktlint_standard_no-single-line-block-comment = disabled ktlint_standard_try-catch-finally-spacing = disabled