From b9db59fa45450da0bfa31192eee349e7a1a58c88 Mon Sep 17 00:00:00 2001 From: Andreas Date: Thu, 18 Aug 2022 20:06:32 +0200 Subject: [PATCH] Lint changes (#7802) - Fixes current lint issues - Changes lint task to lintKotlin on PRs (cherry picked from commit 09abfc7843ef69d65cb4f1a3459ff8ee2718e4f7) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedController.kt # build.gradle.kts --- app/build.gradle.kts | 7 +++- .../data/exh/MergedMangaReferenceMapper.kt | 42 +++++++------------ .../java/eu/kanade/tachiyomi/Migrations.kt | 4 +- .../data/backup/models/BackupChapter.kt | 14 +------ .../models/BackupMergedMangaReference.kt | 36 ++++++---------- .../data/backup/models/BackupSavedSearch.kt | 22 ++++------ .../data/backup/models/BackupTracking.kt | 14 +------ .../data/preference/PreferenceValues.kt | 2 + .../eu/kanade/tachiyomi/source/LocalSource.kt | 4 +- .../kanade/tachiyomi/util/system/ImageUtil.kt | 4 +- .../main/java/exh/uconfig/EhUConfigBuilder.kt | 4 +- build.gradle.kts | 8 +++- 12 files changed, 64 insertions(+), 97 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index eb0dc0567..ce60d4cef 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -296,6 +296,10 @@ tasks { } } + withType().configureEach { + exclude { it.file.path.contains("generated[\\\\/]".toRegex())} + } + // See https://kotlinlang.org/docs/reference/experimental.html#experimental-status-of-experimental-api(-markers) withType { kotlinOptions.freeCompilerArgs += listOf( @@ -321,7 +325,8 @@ tasks { } preBuild { - dependsOn(formatKotlin, copyHebrewStrings, localesConfigTask) + val ktlintTask = if (System.getenv("GITHUB_BASE_REF") == null) formatKotlin else lintKotlin + dependsOn(ktlintTask, copyHebrewStrings, localesConfigTask) } } diff --git a/app/src/main/java/eu/kanade/data/exh/MergedMangaReferenceMapper.kt b/app/src/main/java/eu/kanade/data/exh/MergedMangaReferenceMapper.kt index f9b78317e..cea88182b 100644 --- a/app/src/main/java/eu/kanade/data/exh/MergedMangaReferenceMapper.kt +++ b/app/src/main/java/eu/kanade/data/exh/MergedMangaReferenceMapper.kt @@ -2,29 +2,19 @@ package eu.kanade.data.exh import exh.merged.sql.models.MergedMangaReference -val mergedMangaReferenceMapper = { - id: Long, - isInfoManga: Boolean, - getChapterUpdates: Boolean, - chapterSortMode: Long, - chapterPriority: Long, - downloadChapters: Boolean, - mergeId: Long, - mergeUrl: String, - mangaId: Long?, - mangaUrl: String, - mangaSourceId: Long, -> - MergedMangaReference( - id = id, - isInfoManga = isInfoManga, - getChapterUpdates = getChapterUpdates, - chapterSortMode = chapterSortMode.toInt(), - chapterPriority = chapterPriority.toInt(), - downloadChapters = downloadChapters, - mergeId = mergeId, - mergeUrl = mergeUrl, - mangaId = mangaId, - mangaUrl = mangaUrl, - mangaSourceId = mangaSourceId, - ) -} +val mergedMangaReferenceMapper = + { id: Long, isInfoManga: Boolean, getChapterUpdates: Boolean, chapterSortMode: Long, chapterPriority: Long, downloadChapters: Boolean, mergeId: Long, mergeUrl: String, mangaId: Long?, mangaUrl: String, mangaSourceId: Long -> + MergedMangaReference( + id = id, + isInfoManga = isInfoManga, + getChapterUpdates = getChapterUpdates, + chapterSortMode = chapterSortMode.toInt(), + chapterPriority = chapterPriority.toInt(), + downloadChapters = downloadChapters, + mergeId = mergeId, + mergeUrl = mergeUrl, + mangaId = mangaId, + mangaUrl = mangaUrl, + mangaSourceId = mangaSourceId, + ) + } diff --git a/app/src/main/java/eu/kanade/tachiyomi/Migrations.kt b/app/src/main/java/eu/kanade/tachiyomi/Migrations.kt index 2973bb3b2..ed7148f9b 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/Migrations.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/Migrations.kt @@ -105,9 +105,9 @@ object Migrations { // Reset sorting preference if using removed sort by source val oldSortingMode = prefs.getInt(PreferenceKeys.librarySortingMode, 0) - if (oldSortingMode == 5 /* SOURCE */) { + if (oldSortingMode == 5) { // SOURCE = 5 prefs.edit { - putInt(PreferenceKeys.librarySortingMode, 0 /* ALPHABETICAL */) + putInt(PreferenceKeys.librarySortingMode, 0) // ALPHABETICAL = 0 } } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/models/BackupChapter.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/models/BackupChapter.kt index 917014080..19a81fc60 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/models/BackupChapter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/models/BackupChapter.kt @@ -37,19 +37,7 @@ data class BackupChapter( } } -val backupChapterMapper = { - _: Long, - _: Long, - url: String, - name: String, - scanlator: String?, - read: Boolean, - bookmark: Boolean, - lastPageRead: Long, - chapterNumber: Float, - source_order: Long, - dateFetch: Long, - dateUpload: Long, -> +val backupChapterMapper = { _: Long, _: Long, url: String, name: String, scanlator: String?, read: Boolean, bookmark: Boolean, lastPageRead: Long, chapterNumber: Float, source_order: Long, dateFetch: Long, dateUpload: Long -> BackupChapter( url = url, name = name, diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/models/BackupMergedMangaReference.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/models/BackupMergedMangaReference.kt index a1e85977c..e1eac6aec 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/models/BackupMergedMangaReference.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/models/BackupMergedMangaReference.kt @@ -35,26 +35,16 @@ data class BackupMergedMangaReference( } } -val backupMergedMangaReferenceMapper = { - _: Long, - isInfoManga: Boolean, - getChapterUpdates: Boolean, - chapterSortMode: Long, - chapterPriority: Long, - downloadChapters: Boolean, - _: Long, - mergeUrl: String, - _: Long?, - mangaUrl: String, - mangaSourceId: Long, -> - BackupMergedMangaReference( - isInfoManga = isInfoManga, - getChapterUpdates = getChapterUpdates, - chapterSortMode = chapterSortMode.toInt(), - chapterPriority = chapterPriority.toInt(), - downloadChapters = downloadChapters, - mergeUrl = mergeUrl, - mangaUrl = mangaUrl, - mangaSourceId = mangaSourceId, - ) -} +val backupMergedMangaReferenceMapper = + { _: Long, isInfoManga: Boolean, getChapterUpdates: Boolean, chapterSortMode: Long, chapterPriority: Long, downloadChapters: Boolean, _: Long, mergeUrl: String, _: Long?, mangaUrl: String, mangaSourceId: Long -> + BackupMergedMangaReference( + isInfoManga = isInfoManga, + getChapterUpdates = getChapterUpdates, + chapterSortMode = chapterSortMode.toInt(), + chapterPriority = chapterPriority.toInt(), + downloadChapters = downloadChapters, + mergeUrl = mergeUrl, + mangaUrl = mangaUrl, + mangaSourceId = mangaSourceId, + ) + } diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/models/BackupSavedSearch.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/models/BackupSavedSearch.kt index 78214bf93..4486b6bfd 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/models/BackupSavedSearch.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/models/BackupSavedSearch.kt @@ -14,16 +14,12 @@ data class BackupSavedSearch( @ProtoNumber(4) val source: Long = 0, ) -val backupSavedSearchMapper = { - _: Long, - source: Long, - name: String, - query: String?, - filtersJson: String?, -> - BackupSavedSearch( - source = source, - name = name, - query = query.orEmpty(), - filterList = filtersJson ?: "[]", - ) -} +val backupSavedSearchMapper = + { _: Long, source: Long, name: String, query: String?, filtersJson: String? -> + BackupSavedSearch( + source = source, + name = name, + query = query.orEmpty(), + filterList = filtersJson ?: "[]", + ) + } diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/models/BackupTracking.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/models/BackupTracking.kt index 8a04f8796..a9cf7e57a 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/models/BackupTracking.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/models/BackupTracking.kt @@ -51,19 +51,7 @@ data class BackupTracking( } val backupTrackMapper = { - _id: Long, - manga_id: Long, - syncId: Long, - mediaId: Long, - libraryId: Long?, - title: String, - lastChapterRead: Double, - totalChapters: Long, - status: Long, - score: Float, - remoteUrl: String, - startDate: Long, - finishDate: Long, -> + _: Long, _: Long, syncId: Long, mediaId: Long, libraryId: Long?, title: String, lastChapterRead: Double, totalChapters: Long, status: Long, score: Float, remoteUrl: String, startDate: Long, finishDate: Long -> BackupTracking( syncId = syncId.toInt(), mediaId = mediaId, diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceValues.kt b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceValues.kt index be2f9d6ac..4f660e75d 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceValues.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceValues.kt @@ -19,11 +19,13 @@ object PreferenceValues { /* ktlint-disable experimental:enum-entry-name-case */ // Keys are lowercase to match legacy string values + /* ktlint-disable enum-entry-name-case */ enum class ThemeMode { light, dark, system, } + /* ktlint-enable enum-entry-name-case */ /* ktlint-enable experimental:enum-entry-name-case */ diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/LocalSource.kt b/app/src/main/java/eu/kanade/tachiyomi/source/LocalSource.kt index 8e1c8b83a..8930ab1bd 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/source/LocalSource.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/LocalSource.kt @@ -103,7 +103,9 @@ class LocalSource( } } - else -> { /* Do nothing */ } + else -> { + /* Do nothing */ + } } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/system/ImageUtil.kt b/app/src/main/java/eu/kanade/tachiyomi/util/system/ImageUtil.kt index 0d30f96f2..b030a03cc 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/util/system/ImageUtil.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/util/system/ImageUtil.kt @@ -83,7 +83,9 @@ object ImageUtil { Format.Webp -> type.isAnimated && Build.VERSION.SDK_INT >= Build.VERSION_CODES.P else -> false } - } catch (e: Exception) { /* Do Nothing */ } + } catch (e: Exception) { + /* Do Nothing */ + } return false } diff --git a/app/src/main/java/exh/uconfig/EhUConfigBuilder.kt b/app/src/main/java/exh/uconfig/EhUConfigBuilder.kt index b4af04091..348a27e4c 100644 --- a/app/src/main/java/exh/uconfig/EhUConfigBuilder.kt +++ b/app/src/main/java/exh/uconfig/EhUConfigBuilder.kt @@ -87,7 +87,7 @@ object Entry { override val key = "uh" } - /* ktlint-disable experimental:enum-entry-name-case */ + /* ktlint-disable enum-entry-name-case */ enum class ImageSize(override val value: String) : ConfigItem { AUTO("0"), `2400`("5"), @@ -131,7 +131,7 @@ object Entry { override val key = "tr" } - /* ktlint-enable experimental:enum-entry-name-case */ + /* ktlint-enable enum-entry-name-case */ enum class UseOriginalImages(override val value: String) : ConfigItem { NO("0"), diff --git a/build.gradle.kts b/build.gradle.kts index bfe18efe1..b63657db5 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -27,8 +27,12 @@ subprojects { kotlinter { experimentalRules = true - // Doesn't play well with Android Studio - disabledRules = arrayOf("experimental:argument-list-wrapping", "experimental:comment-wrapping") + + disabledRules = arrayOf( + "experimental:argument-list-wrapping", // Doesn't play well with Android Studio + "experimental:comment-wrapping", // Doesn't play nice with SY specifiers + "filename", // Often broken to give a more general name + ) } }