From 79b167002c7bccb561a7f44119513a8dd00852df Mon Sep 17 00:00:00 2001
From: FooIbar <118464521+FooIbar@users.noreply.github.com>
Date: Wed, 24 Jan 2024 16:32:01 +0800
Subject: [PATCH] Use spotless's default ktlint version (#657)

* Use spotless's default ktlint version

* Suppress property naming rule for backing property
---
 app/build.gradle.kts                                        | 6 ++----
 .../com/hippo/ehviewer/ui/screen/GalleryDetailScreen.kt     | 2 ++
 gradle/libs.versions.toml                                   | 4 ----
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 1cd185c15..7563686bc 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -295,16 +295,14 @@ cargo {
     if (isRelease) profile = "release"
 }
 
-val ktlintVersion = libs.versions.ktlint.get()
-
 spotless {
     kotlin {
         // https://github.com/diffplug/spotless/issues/111
         target("src/**/*.kt")
-        ktlint(ktlintVersion)
+        ktlint()
     }
     kotlinGradle {
-        ktlint(ktlintVersion)
+        ktlint()
     }
 }
 
diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/GalleryDetailScreen.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/GalleryDetailScreen.kt
index 19cd0176f..ce8eda7a0 100644
--- a/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/GalleryDetailScreen.kt
+++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/GalleryDetailScreen.kt
@@ -313,6 +313,7 @@ fun GalleryDetailScreen(args: GalleryDetailScreenArgs, navigator: DestinationsNa
             return
         }
         class ArchiveListDialogHelper : DialogInterface.OnDismissListener {
+            @Suppress("ktlint:standard:property-naming")
             private var _binding: DialogArchiveListBinding? = null
             private val binding get() = _binding!!
             private var mJob: Job? = null
@@ -663,6 +664,7 @@ fun GalleryDetailScreen(args: GalleryDetailScreenArgs, navigator: DestinationsNa
                         val granted = isAtLeastQ || context.requestPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE)
                         if (granted) {
                             class TorrentListDialogHelper : DialogInterface.OnDismissListener {
+                                @Suppress("ktlint:standard:property-naming")
                                 private var _binding: DialogTorrentListBinding? = null
                                 private val binding get() = _binding!!
                                 private var mJob: Job? = null
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 17be1a12a..557595e90 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -26,7 +26,6 @@ kotlinx-coroutines = "1.8.0-RC2"
 kotlinx-datetime = "0.5.0"
 kotlinx-serialization = "1.6.2"
 ksp = "2.0.0-Beta3-1.0.17"
-ktlint = "1.0.1"
 ktor = "3.0.0-beta-1"
 okhttp3 = "5.0.0-alpha.12"
 okio = "3.7.0"
@@ -97,9 +96,6 @@ kotlinx-serialization-cbor = { module = "org.jetbrains.kotlinx:kotlinx-serializa
 kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinx-serialization" }
 kotlinx-serialization-json-okio = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json-okio", version.ref = "kotlinx-serialization" }
 
-# For renovate
-ktlint = { module = "com.pinterest:ktlint", version.ref = "ktlint" }
-
 ktor-client-okhttp = { module = "io.ktor:ktor-client-okhttp", version.ref = "ktor" }
 
 material = { module = "com.google.android.material:material", version.ref = "google-android-material" }