Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update to Kotlin 1.4.21 and kotlinter 3.3.0

Browse Source 
(cherry picked from commit 59859e124f0321ad54c522ffa5673672cb4a368c)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt
This commit is contained in:
arkon 2020-12-08 22:31:48 -05:00 committed by Jobobby04
parent 45086af3ae
commit 0137262e4c
5 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt
View File

@ -89,10 +89,14 @@ class LibraryUpdateService(
*/ */
enum class Target { enum class Target {
CHAPTERS, // Manga chapters CHAPTERS, // Manga chapters
COVERS, // Manga covers COVERS, // Manga covers
TRACKING, // Tracking metadata TRACKING, // Tracking metadata
// SY --> // SY -->
SYNC_FOLLOWS, // MangaDex specific, pull mangadex manga in reading, rereading SYNC_FOLLOWS, // MangaDex specific, pull mangadex manga in reading, rereading
PUSH_FAVORITES // MangaDex specific, push mangadex manga to mangadex PUSH_FAVORITES // MangaDex specific, push mangadex manga to mangadex
// SY <-- // SY <--
} }

3
app/src/main/java/eu/kanade/tachiyomi/data/track/myanimelist/MyAnimeList.kt
View File

@ -132,7 +132,8 @@ class MyAnimeList(private val context: Context, id: Int) : TrackService(id) {
private fun checkCookies(): Boolean { private fun checkCookies(): Boolean {
val url = BASE_URL.toHttpUrlOrNull()!! val url = BASE_URL.toHttpUrlOrNull()!!
val ckCount = networkService.cookieManager.get(url).count { val ckCount = networkService.cookieManager.get(url).count {
it.name == USER_SESSION_COOKIE || it.name == LOGGED_IN_COOKIE } it.name == USER_SESSION_COOKIE || it.name == LOGGED_IN_COOKIE
}
return ckCount == 2 return ckCount == 2
} }

1
app/src/main/java/eu/kanade/tachiyomi/extension/util/ExtensionLoader.kt
View File

@ -40,6 +40,7 @@ internal object ExtensionLoader {
// inorichi's key // inorichi's key
private const val officialSignature = "7ce04da7773d41b489f4693a366c36bcd0a11fc39b547168553c285bd7348e23" private const val officialSignature = "7ce04da7773d41b489f4693a366c36bcd0a11fc39b547168553c285bd7348e23"
/** /**
* List of the trusted signatures. * List of the trusted signatures.
*/ */

1
app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonAdapter.kt
View File

@ -23,6 +23,7 @@ class WebtoonAdapter(val viewer: WebtoonViewer) : RecyclerView.Adapter<RecyclerV
private set private set
var currentChapter: ReaderChapter? = null var currentChapter: ReaderChapter? = null
/** /**
* Updates this adapter with the given [chapters]. It handles setting a few pages of the * Updates this adapter with the given [chapters]. It handles setting a few pages of the
* next/previous chapter to allow seamless transitions. * next/previous chapter to allow seamless transitions.

4
buildSrc/src/main/kotlin/Dependencies.kt
View File

@ -1,7 +1,7 @@
object BuildPluginsVersion { object BuildPluginsVersion {
const val AGP = "4.1.1" const val AGP = "4.1.1"
const val KOTLIN = "1.4.20" const val KOTLIN = "1.4.21"
const val KOTLINTER = "3.0.2" const val KOTLINTER = "3.3.0"
const val VERSIONS_PLUGIN = "0.36.0" const val VERSIONS_PLUGIN = "0.36.0"
const val ABOUTLIB_PLUGIN = "8.6.3" const val ABOUTLIB_PLUGIN = "8.6.3"
} }