diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/database/models/Chapter.kt b/app/src/main/java/eu/kanade/tachiyomi/data/database/models/Chapter.kt index 799998f20..53ddbd36c 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/database/models/Chapter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/models/Chapter.kt @@ -1,4 +1,4 @@ -@file:Suppress("PropertyName", "ktlint:standard:property-naming") +@file:Suppress("PropertyName") package eu.kanade.tachiyomi.data.database.models diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/database/models/ChapterImpl.kt b/app/src/main/java/eu/kanade/tachiyomi/data/database/models/ChapterImpl.kt index 7db913c99..fe5c5a30d 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/database/models/ChapterImpl.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/models/ChapterImpl.kt @@ -1,4 +1,4 @@ -@file:Suppress("PropertyName", "ktlint:standard:property-naming") +@file:Suppress("PropertyName") package eu.kanade.tachiyomi.data.database.models diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/database/models/Track.kt b/app/src/main/java/eu/kanade/tachiyomi/data/database/models/Track.kt index 15c12c4a0..6a4d5d741 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/database/models/Track.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/models/Track.kt @@ -1,4 +1,4 @@ -@file:Suppress("PropertyName", "ktlint:standard:property-naming") +@file:Suppress("PropertyName") package eu.kanade.tachiyomi.data.database.models diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/database/models/TrackImpl.kt b/app/src/main/java/eu/kanade/tachiyomi/data/database/models/TrackImpl.kt index da5aa2856..91c4c4fe7 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/database/models/TrackImpl.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/models/TrackImpl.kt @@ -1,4 +1,4 @@ -@file:Suppress("PropertyName", "ktlint:standard:property-naming") +@file:Suppress("PropertyName") package eu.kanade.tachiyomi.data.database.models diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/model/TrackSearch.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/model/TrackSearch.kt index 94160d6ab..fabaa2f69 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/track/model/TrackSearch.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/model/TrackSearch.kt @@ -1,4 +1,4 @@ -@file:Suppress("PropertyName", "ktlint:standard:property-naming") +@file:Suppress("PropertyName") package eu.kanade.tachiyomi.data.track.model diff --git a/core/common/src/main/kotlin/eu/kanade/tachiyomi/network/Requests.kt b/core/common/src/main/kotlin/eu/kanade/tachiyomi/network/Requests.kt index fd5eb92cb..cb1fcb3b3 100644 --- a/core/common/src/main/kotlin/eu/kanade/tachiyomi/network/Requests.kt +++ b/core/common/src/main/kotlin/eu/kanade/tachiyomi/network/Requests.kt @@ -1,4 +1,4 @@ -@file:Suppress("FunctionName", "ktlint:standard:function-naming") +@file:Suppress("FunctionName") package eu.kanade.tachiyomi.network diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 9d62b99e3..5fb3e42a8 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -9,7 +9,7 @@ sqldelight = "2.0.2" sqlite = "2.4.0" voyager = "1.0.0" spotless = "6.25.0" -ktlint-core = "1.3.1" +ktlint-core = "1.4.0" firebase-bom = "33.5.1" [libraries] diff --git a/presentation-core/src/main/java/tachiyomi/presentation/core/icons/Discord.kt b/presentation-core/src/main/java/tachiyomi/presentation/core/icons/Discord.kt index 49d2842f6..b3499579d 100644 --- a/presentation-core/src/main/java/tachiyomi/presentation/core/icons/Discord.kt +++ b/presentation-core/src/main/java/tachiyomi/presentation/core/icons/Discord.kt @@ -82,5 +82,5 @@ val CustomIcons.Discord: ImageVector return _discord!! } -@Suppress("ObjectPropertyName", "ktlint:standard:backing-property-naming") +@Suppress("ObjectPropertyName") private var _discord: ImageVector? = null diff --git a/presentation-core/src/main/java/tachiyomi/presentation/core/icons/Facebook.kt b/presentation-core/src/main/java/tachiyomi/presentation/core/icons/Facebook.kt index 52d42fd52..de21306d6 100644 --- a/presentation-core/src/main/java/tachiyomi/presentation/core/icons/Facebook.kt +++ b/presentation-core/src/main/java/tachiyomi/presentation/core/icons/Facebook.kt @@ -59,5 +59,5 @@ val CustomIcons.Facebook: ImageVector return _facebook!! } -@Suppress("ObjectPropertyName", "ktlint:standard:backing-property-naming") +@Suppress("ObjectPropertyName") private var _facebook: ImageVector? = null diff --git a/presentation-core/src/main/java/tachiyomi/presentation/core/icons/Github.kt b/presentation-core/src/main/java/tachiyomi/presentation/core/icons/Github.kt index 519f2402c..846f2dcf9 100644 --- a/presentation-core/src/main/java/tachiyomi/presentation/core/icons/Github.kt +++ b/presentation-core/src/main/java/tachiyomi/presentation/core/icons/Github.kt @@ -64,5 +64,5 @@ val CustomIcons.Github: ImageVector return _github!! } -@Suppress("ObjectPropertyName", "ktlint:standard:backing-property-naming") +@Suppress("ObjectPropertyName") private var _github: ImageVector? = null diff --git a/presentation-core/src/main/java/tachiyomi/presentation/core/icons/Reddit.kt b/presentation-core/src/main/java/tachiyomi/presentation/core/icons/Reddit.kt index 7b462c801..a3fe7b9c8 100644 --- a/presentation-core/src/main/java/tachiyomi/presentation/core/icons/Reddit.kt +++ b/presentation-core/src/main/java/tachiyomi/presentation/core/icons/Reddit.kt @@ -90,5 +90,5 @@ val CustomIcons.Reddit: ImageVector return _reddit!! } -@Suppress("ObjectPropertyName", "ktlint:standard:backing-property-naming") +@Suppress("ObjectPropertyName") private var _reddit: ImageVector? = null diff --git a/presentation-core/src/main/java/tachiyomi/presentation/core/icons/X.kt b/presentation-core/src/main/java/tachiyomi/presentation/core/icons/X.kt index 6ce31f4f0..dadebfc08 100644 --- a/presentation-core/src/main/java/tachiyomi/presentation/core/icons/X.kt +++ b/presentation-core/src/main/java/tachiyomi/presentation/core/icons/X.kt @@ -57,5 +57,5 @@ val CustomIcons.X: ImageVector return _x!! } -@Suppress("ObjectPropertyName", "ktlint:standard:backing-property-naming") +@Suppress("ObjectPropertyName") private var _x: ImageVector? = null diff --git a/source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/model/SChapter.kt b/source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/model/SChapter.kt index ba974e76b..31d05d87e 100644 --- a/source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/model/SChapter.kt +++ b/source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/model/SChapter.kt @@ -1,4 +1,4 @@ -@file:Suppress("PropertyName", "ktlint:standard:property-naming") +@file:Suppress("PropertyName") package eu.kanade.tachiyomi.source.model diff --git a/source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/model/SChapterImpl.kt b/source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/model/SChapterImpl.kt index c4c137539..4832faa70 100644 --- a/source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/model/SChapterImpl.kt +++ b/source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/model/SChapterImpl.kt @@ -1,4 +1,4 @@ -@file:Suppress("PropertyName", "ktlint:standard:property-naming") +@file:Suppress("PropertyName") package eu.kanade.tachiyomi.source.model diff --git a/source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/model/SManga.kt b/source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/model/SManga.kt index fdcf597d9..5b76602e6 100644 --- a/source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/model/SManga.kt +++ b/source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/model/SManga.kt @@ -1,4 +1,4 @@ -@file:Suppress("PropertyName", "ktlint:standard:property-naming") +@file:Suppress("PropertyName") package eu.kanade.tachiyomi.source.model diff --git a/source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/model/SMangaImpl.kt b/source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/model/SMangaImpl.kt index 73e732b94..df0fc3312 100644 --- a/source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/model/SMangaImpl.kt +++ b/source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/model/SMangaImpl.kt @@ -1,4 +1,4 @@ -@file:Suppress("PropertyName", "ktlint:standard:property-naming") +@file:Suppress("PropertyName") package eu.kanade.tachiyomi.source.model diff --git a/source-local/src/androidMain/kotlin/tachiyomi/source/local/LocalSource.kt b/source-local/src/androidMain/kotlin/tachiyomi/source/local/LocalSource.kt index e801b28e2..17fb4492a 100644 --- a/source-local/src/androidMain/kotlin/tachiyomi/source/local/LocalSource.kt +++ b/source-local/src/androidMain/kotlin/tachiyomi/source/local/LocalSource.kt @@ -55,10 +55,10 @@ actual class LocalSource( private val json: Json by injectLazy() private val xml: XML by injectLazy() - @Suppress("PrivatePropertyName", "ktlint:standard:property-naming") + @Suppress("PrivatePropertyName") private val PopularFilters = FilterList(OrderBy.Popular(context)) - @Suppress("PrivatePropertyName", "ktlint:standard:property-naming") + @Suppress("PrivatePropertyName") private val LatestFilters = FilterList(OrderBy.Latest(context)) override val name: String = context.stringResource(MR.strings.local_source)