From 0ffe80e6ec7cc26aab668c79a8562d328f6440b5 Mon Sep 17 00:00:00 2001 From: Aayush Gupta Date: Fri, 7 Nov 2025 16:09:28 +0800 Subject: [PATCH] Bump ktlint to latest stable release and maven coordinate Disable all new rules to avoid massive file-changes. All new rules should be enabled one by one as per requirements in separate commit to make review easier. Signed-off-by: Aayush Gupta --- .editorconfig | 40 +++++++++++++++++++++++++++++++++++++++ app/build.gradle.kts | 4 ++-- gradle/libs.versions.toml | 4 ++-- 3 files changed, 44 insertions(+), 4 deletions(-) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 000000000..078bfc6fa --- /dev/null +++ b/.editorconfig @@ -0,0 +1,40 @@ +# +# SPDX-FileCopyrightText: 2025 NewPipe e.V. +# SPDX-License-Identifier: GPL-3.0-or-later +# + +root = true + +[*.{kt,kts}] +ktlint_standard_annotation = disabled +ktlint_standard_argument-list-wrapping = disabled +ktlint_standard_backing-property-naming = disabled +ktlint_standard_blank-line-before-declaration = disabled +ktlint_standard_chain-method-continuation = disabled +ktlint_standard_class-signature = disabled +ktlint_standard_comment-wrapping = disabled +ktlint_standard_enum-wrapping = disabled +ktlint_standard_function-expression-body = disabled +ktlint_standard_function-literal = disabled +ktlint_standard_function-signature = disabled +ktlint_standard_indent = disabled +ktlint_standard_max-line-length = disabled +ktlint_standard_multiline-expression-wrapping = disabled +ktlint_standard_multiline-if-else = disabled +ktlint_standard_no-blank-line-in-list = disabled +ktlint_standard_no-consecutive-comments = disabled +ktlint_standard_no-empty-first-line-in-class-body = disabled +ktlint_standard_no-empty-first-line-in-method-block = disabled +ktlint_standard_no-line-break-after-else = disabled +ktlint_standard_no-semi = disabled +ktlint_standard_no-single-line-block-comment = disabled +ktlint_standard_package-name = disabled +ktlint_standard_parameter-list-wrapping = disabled +ktlint_standard_property-naming = disabled +ktlint_standard_spacing-between-declarations-with-annotations = disabled +ktlint_standard_spacing-between-declarations-with-comments = disabled +ktlint_standard_statement-wrapping = disabled +ktlint_standard_string-template-indent = disabled +ktlint_standard_trailing-comma-on-call-site = disabled +ktlint_standard_trailing-comma-on-declaration-site = disabled +ktlint_standard_try-catch-finally-spacing = disabled diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 1417309f1..bfb1127ab 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -165,7 +165,7 @@ tasks.register("runKtlint") { outputs.dir(outputDir) mainClass.set("com.pinterest.ktlint.Main") classpath = configurations.getByName("ktlint") - args = listOf("src/**/*.kt") + args = listOf("--editorconfig=../.editorconfig", "src/**/*.kt") jvmArgs = listOf("--add-opens", "java.base/java.lang=ALL-UNNAMED") } @@ -174,7 +174,7 @@ tasks.register("formatKtlint") { outputs.dir(outputDir) mainClass.set("com.pinterest.ktlint.Main") classpath = configurations.getByName("ktlint") - args = listOf("-F", "src/**/*.kt") + args = listOf("--editorconfig=../.editorconfig", "-F", "src/**/*.kt") jvmArgs = listOf("--add-opens", "java.base/java.lang=ALL-UNNAMED") } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 10aa55e8e..9696253e2 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -24,7 +24,7 @@ junit = "4.13.2" junit-ext = "1.3.0" kotlin = "2.2.21" ksp = "2.3.2" -ktlint = "0.45.2" +ktlint = "1.7.1" leakcanary = "2.14" lifecycle = "2.9.4" localbroadcastmanager = "1.1.0" @@ -119,7 +119,7 @@ newpipe-nanojson = { module = "com.github.TeamNewPipe:nanojson", version.ref = " noties-markwon-core = { module = "io.noties.markwon:core", version.ref = "markwon" } noties-markwon-linkify = { module = "io.noties.markwon:linkify", version.ref = "markwon" } ocpsoft-prettytime = { module = "org.ocpsoft.prettytime:prettytime", version.ref = "prettytime" } -pinterest-ktlint = { module = "com.pinterest:ktlint", version.ref = "ktlint" } +pinterest-ktlint = { module = "com.pinterest.ktlint:ktlint-cli", version.ref = "ktlint" } puppycrawl-checkstyle = { module = "com.puppycrawl.tools:checkstyle", version.ref = "checkstyle" } reactivex-rxandroid = { module = "io.reactivex.rxjava3:rxandroid", version.ref = "rxandroid" } reactivex-rxjava = { module = "io.reactivex.rxjava3:rxjava", version.ref = "rxjava" }