From ed7dbc6d2a1a13b4accb7fa4a5b0e41de9916e4e Mon Sep 17 00:00:00 2001 From: Theodoro Mota Date: Tue, 23 Jan 2024 15:54:05 -0300 Subject: [PATCH] Removing ktlint --- build.gradle.kts | 2 -- buildSrc/build.gradle.kts | 1 - .../src/main/kotlin/tachiyomi.lint.gradle.kts | 22 ------------------- gradle/libs.versions.toml | 2 -- 4 files changed, 27 deletions(-) delete mode 100644 buildSrc/src/main/kotlin/tachiyomi.lint.gradle.kts diff --git a/build.gradle.kts b/build.gradle.kts index ad3a21a2e..28536819a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -32,8 +32,6 @@ subprojects { } plugins.withType { - plugins.apply("tachiyomi.lint") - configure { compileSdkVersion(AndroidConfig.compileSdk) defaultConfig { diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 2c76035b7..fa0b5483b 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -5,7 +5,6 @@ plugins { dependencies { implementation(androidxLibs.gradle) implementation(kotlinLibs.gradle) - implementation(libs.ktlint) implementation(gradleApi()) } diff --git a/buildSrc/src/main/kotlin/tachiyomi.lint.gradle.kts b/buildSrc/src/main/kotlin/tachiyomi.lint.gradle.kts deleted file mode 100644 index 5216d4962..000000000 --- a/buildSrc/src/main/kotlin/tachiyomi.lint.gradle.kts +++ /dev/null @@ -1,22 +0,0 @@ -import org.jlleitschuh.gradle.ktlint.KtlintExtension -import org.jlleitschuh.gradle.ktlint.KtlintPlugin - -apply() - -extensions.configure("ktlint") { - version.set("0.50.0") - android.set(true) - enableExperimentalRules.set(true) - - filter { - exclude("**/generated/**") - - // For some reason this is needed for Kotlin MPP - exclude { tree -> - val path = tree.file.path - listOf("/generated/").any { - path.contains(it) - } - } - } -} diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 479c3b44a..fc93494fe 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -93,8 +93,6 @@ voyager-screenmodel = { module = "cafe.adriel.voyager:voyager-screenmodel", vers voyager-tab-navigator = { module = "cafe.adriel.voyager:voyager-tab-navigator", version.ref = "voyager" } voyager-transitions = { module = "cafe.adriel.voyager:voyager-transitions", version.ref = "voyager" } -ktlint = "org.jlleitschuh.gradle:ktlint-gradle:12.0.3" - [bundles] okhttp = ["okhttp-core", "okhttp-logging", "okhttp-brotli", "okhttp-dnsoverhttps"] js-engine = ["quickjs-android"]