From 2a3d88cea06c08867001684566911f9f8d6d2a56 Mon Sep 17 00:00:00 2001 From: arkon Date: Thu, 9 Sep 2021 18:25:46 -0400 Subject: [PATCH] Target SDK 31 (#9022) --- buildSrc/src/main/kotlin/AndroidConfig.kt | 4 ++-- multisrc/overrides/guya/default/AndroidManifest.xml | 1 + multisrc/overrides/madara/default/AndroidManifest.xml | 1 + multisrc/overrides/mangadventure/default/AndroidManifest.xml | 1 + multisrc/overrides/nyahentai/default/AndroidManifest.xml | 1 + multisrc/overrides/webtoons/webtoons/AndroidManifest.xml | 1 + multisrc/overrides/weebreader/default/AndroidManifest.xml | 1 + multisrc/overrides/wpmangareader/default/AndroidManifest.xml | 1 + multisrc/overrides/wpmangastream/default/AndroidManifest.xml | 1 + .../kanade/tachiyomi/multisrc/wpmangastream/WPMangaStream.kt | 3 +-- src/all/batoto/AndroidManifest.xml | 1 + src/all/comickfun/AndroidManifest.xml | 1 + src/all/cubari/AndroidManifest.xml | 1 + src/all/ehentai/AndroidManifest.xml | 1 + src/all/genkanio/AndroidManifest.xml | 1 + src/all/hitomi/AndroidManifest.xml | 1 + src/all/imhentai/AndroidManifest.xml | 1 + src/all/mangadex/AndroidManifest.xml | 1 + src/all/mangapark/AndroidManifest.xml | 1 + src/all/mangaplus/AndroidManifest.xml | 1 + src/all/nhentai/AndroidManifest.xml | 1 + src/all/ninehentai/AndroidManifest.xml | 1 + src/en/bilibilicomics/AndroidManifest.xml | 3 ++- src/en/catmanga/AndroidManifest.xml | 1 + src/en/comikey/AndroidManifest.xml | 1 + src/en/dynasty/AndroidManifest.xml | 1 + src/en/hentai2read/AndroidManifest.xml | 1 + src/en/homeheroscans/AndroidManifest.xml | 1 + src/en/mangamiso/AndroidManifest.xml | 1 + src/en/mangamutiny/AndroidManifest.xml | 1 + src/en/myhentaigallery/AndroidManifest.xml | 1 + src/en/purplecress/AndroidManifest.xml | 1 + src/en/randomscans/AndroidManifest.xml | 1 + src/en/tsumino/AndroidManifest.xml | 1 + src/es/lectormanga/AndroidManifest.xml | 1 + src/es/tmohentai/AndroidManifest.xml | 1 + src/es/tumangaonline/AndroidManifest.xml | 1 + src/ru/desu/AndroidManifest.xml | 1 + src/ru/libmanga/AndroidManifest.xml | 1 + src/ru/mintmanga/AndroidManifest.xml | 1 + src/ru/readmanga/AndroidManifest.xml | 1 + src/ru/remanga/AndroidManifest.xml | 1 + src/zh/baozimanhua/AndroidManifest.xml | 1 + src/zh/dmzj/AndroidManifest.xml | 1 + src/zh/jinmantiantang/AndroidManifest.xml | 1 + src/zh/kuaikanmanhua/AndroidManifest.xml | 1 + src/zh/mangabz/AndroidManifest.xml | 1 + src/zh/manhuagui/AndroidManifest.xml | 1 + src/zh/tencentcomics/AndroidManifest.xml | 1 + 49 files changed, 51 insertions(+), 5 deletions(-) diff --git a/buildSrc/src/main/kotlin/AndroidConfig.kt b/buildSrc/src/main/kotlin/AndroidConfig.kt index ea5eb1794..829a775fd 100644 --- a/buildSrc/src/main/kotlin/AndroidConfig.kt +++ b/buildSrc/src/main/kotlin/AndroidConfig.kt @@ -1,5 +1,5 @@ object AndroidConfig { - const val compileSdk = 30 + const val compileSdk = 31 const val minSdk = 21 - const val targetSdk = 29 + const val targetSdk = 31 } diff --git a/multisrc/overrides/guya/default/AndroidManifest.xml b/multisrc/overrides/guya/default/AndroidManifest.xml index 0b528ca80..e4d6357a6 100644 --- a/multisrc/overrides/guya/default/AndroidManifest.xml +++ b/multisrc/overrides/guya/default/AndroidManifest.xml @@ -6,6 +6,7 @@ diff --git a/multisrc/overrides/madara/default/AndroidManifest.xml b/multisrc/overrides/madara/default/AndroidManifest.xml index 0fc9b70c0..ad44865c8 100644 --- a/multisrc/overrides/madara/default/AndroidManifest.xml +++ b/multisrc/overrides/madara/default/AndroidManifest.xml @@ -6,6 +6,7 @@ diff --git a/multisrc/overrides/mangadventure/default/AndroidManifest.xml b/multisrc/overrides/mangadventure/default/AndroidManifest.xml index 9378e782e..b4c433f46 100644 --- a/multisrc/overrides/mangadventure/default/AndroidManifest.xml +++ b/multisrc/overrides/mangadventure/default/AndroidManifest.xml @@ -4,6 +4,7 @@ diff --git a/multisrc/overrides/nyahentai/default/AndroidManifest.xml b/multisrc/overrides/nyahentai/default/AndroidManifest.xml index 7414bc582..8b96299c7 100644 --- a/multisrc/overrides/nyahentai/default/AndroidManifest.xml +++ b/multisrc/overrides/nyahentai/default/AndroidManifest.xml @@ -6,6 +6,7 @@ diff --git a/multisrc/overrides/webtoons/webtoons/AndroidManifest.xml b/multisrc/overrides/webtoons/webtoons/AndroidManifest.xml index 34f0041e9..14082a252 100644 --- a/multisrc/overrides/webtoons/webtoons/AndroidManifest.xml +++ b/multisrc/overrides/webtoons/webtoons/AndroidManifest.xml @@ -6,6 +6,7 @@ diff --git a/multisrc/overrides/weebreader/default/AndroidManifest.xml b/multisrc/overrides/weebreader/default/AndroidManifest.xml index 821836fd6..4c361ab86 100644 --- a/multisrc/overrides/weebreader/default/AndroidManifest.xml +++ b/multisrc/overrides/weebreader/default/AndroidManifest.xml @@ -6,6 +6,7 @@ diff --git a/multisrc/overrides/wpmangareader/default/AndroidManifest.xml b/multisrc/overrides/wpmangareader/default/AndroidManifest.xml index 15a26d156..490d1a53d 100644 --- a/multisrc/overrides/wpmangareader/default/AndroidManifest.xml +++ b/multisrc/overrides/wpmangareader/default/AndroidManifest.xml @@ -6,6 +6,7 @@ diff --git a/multisrc/overrides/wpmangastream/default/AndroidManifest.xml b/multisrc/overrides/wpmangastream/default/AndroidManifest.xml index 3642d357f..d408e9008 100644 --- a/multisrc/overrides/wpmangastream/default/AndroidManifest.xml +++ b/multisrc/overrides/wpmangastream/default/AndroidManifest.xml @@ -6,6 +6,7 @@ diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangastream/WPMangaStream.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangastream/WPMangaStream.kt index 07df47824..fbe04a381 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangastream/WPMangaStream.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangastream/WPMangaStream.kt @@ -97,7 +97,7 @@ abstract class WPMangaStream( */ protected open fun mangaPathFromUrl(s: String): Single { val baseMangaUrl = baseUrl.toHttpUrlOrNull()!! - // Would be dope if wpmangastream had a mangaUrlDirectory like wpmangareader + // Would be dope if wpmangastream had a mangaUrlDirectory like wpmangareader val mangaDirectories = listOf("manga", "comics", "komik") return s.toHttpUrlOrNull()?.let { url -> fun pathLengthIs(url: HttpUrl, n: Int, strict: Boolean = false) = url.pathSegments.size == n && url.pathSegments[n - 1].isNotEmpty() || (!strict && url.pathSegments.size == n + 1 && url.pathSegments[n].isEmpty()) @@ -140,7 +140,6 @@ abstract class WPMangaStream( } } - override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request { var url = "$baseUrl/manga/".toHttpUrlOrNull()!!.newBuilder() url.addQueryParameter("title", query) diff --git a/src/all/batoto/AndroidManifest.xml b/src/all/batoto/AndroidManifest.xml index 88d434029..d9ff10fa5 100644 --- a/src/all/batoto/AndroidManifest.xml +++ b/src/all/batoto/AndroidManifest.xml @@ -6,6 +6,7 @@ package="eu.kanade.tachiyomi.extension"> diff --git a/src/all/comickfun/AndroidManifest.xml b/src/all/comickfun/AndroidManifest.xml index 8250c5ba1..50803f5b7 100644 --- a/src/all/comickfun/AndroidManifest.xml +++ b/src/all/comickfun/AndroidManifest.xml @@ -6,6 +6,7 @@ diff --git a/src/all/cubari/AndroidManifest.xml b/src/all/cubari/AndroidManifest.xml index a28e3cbe3..a7ae8ab82 100644 --- a/src/all/cubari/AndroidManifest.xml +++ b/src/all/cubari/AndroidManifest.xml @@ -6,6 +6,7 @@ diff --git a/src/all/ehentai/AndroidManifest.xml b/src/all/ehentai/AndroidManifest.xml index 65f41e2df..c529fbbd1 100644 --- a/src/all/ehentai/AndroidManifest.xml +++ b/src/all/ehentai/AndroidManifest.xml @@ -6,6 +6,7 @@ diff --git a/src/all/genkanio/AndroidManifest.xml b/src/all/genkanio/AndroidManifest.xml index be2ea6bbd..505f2c6e6 100644 --- a/src/all/genkanio/AndroidManifest.xml +++ b/src/all/genkanio/AndroidManifest.xml @@ -6,6 +6,7 @@ diff --git a/src/all/hitomi/AndroidManifest.xml b/src/all/hitomi/AndroidManifest.xml index b722a7165..10e2eea17 100644 --- a/src/all/hitomi/AndroidManifest.xml +++ b/src/all/hitomi/AndroidManifest.xml @@ -6,6 +6,7 @@ diff --git a/src/all/imhentai/AndroidManifest.xml b/src/all/imhentai/AndroidManifest.xml index f9ea1cb39..c0545790e 100644 --- a/src/all/imhentai/AndroidManifest.xml +++ b/src/all/imhentai/AndroidManifest.xml @@ -6,6 +6,7 @@ diff --git a/src/all/mangadex/AndroidManifest.xml b/src/all/mangadex/AndroidManifest.xml index 7724e5016..591d60801 100644 --- a/src/all/mangadex/AndroidManifest.xml +++ b/src/all/mangadex/AndroidManifest.xml @@ -6,6 +6,7 @@ diff --git a/src/all/mangapark/AndroidManifest.xml b/src/all/mangapark/AndroidManifest.xml index dc0ffa3cf..e832f73e1 100644 --- a/src/all/mangapark/AndroidManifest.xml +++ b/src/all/mangapark/AndroidManifest.xml @@ -6,6 +6,7 @@ package="eu.kanade.tachiyomi.extension"> diff --git a/src/all/mangaplus/AndroidManifest.xml b/src/all/mangaplus/AndroidManifest.xml index ac5eeea9f..d4d44d41d 100644 --- a/src/all/mangaplus/AndroidManifest.xml +++ b/src/all/mangaplus/AndroidManifest.xml @@ -6,6 +6,7 @@ diff --git a/src/all/nhentai/AndroidManifest.xml b/src/all/nhentai/AndroidManifest.xml index 294d8050f..ce28ef43d 100644 --- a/src/all/nhentai/AndroidManifest.xml +++ b/src/all/nhentai/AndroidManifest.xml @@ -6,6 +6,7 @@ diff --git a/src/all/ninehentai/AndroidManifest.xml b/src/all/ninehentai/AndroidManifest.xml index 5ed068961..02f8050b4 100644 --- a/src/all/ninehentai/AndroidManifest.xml +++ b/src/all/ninehentai/AndroidManifest.xml @@ -6,6 +6,7 @@ diff --git a/src/en/bilibilicomics/AndroidManifest.xml b/src/en/bilibilicomics/AndroidManifest.xml index 000affda9..b7d48321f 100644 --- a/src/en/bilibilicomics/AndroidManifest.xml +++ b/src/en/bilibilicomics/AndroidManifest.xml @@ -6,6 +6,7 @@ @@ -27,7 +28,7 @@ android:host="www.m.bilibilicomics.com" android:pathPattern="/detail/mc..*" android:scheme="https" /> - + diff --git a/src/en/comikey/AndroidManifest.xml b/src/en/comikey/AndroidManifest.xml index db797d8cd..0dded649c 100644 --- a/src/en/comikey/AndroidManifest.xml +++ b/src/en/comikey/AndroidManifest.xml @@ -6,6 +6,7 @@ diff --git a/src/en/dynasty/AndroidManifest.xml b/src/en/dynasty/AndroidManifest.xml index 3f781b205..ab415ec1d 100644 --- a/src/en/dynasty/AndroidManifest.xml +++ b/src/en/dynasty/AndroidManifest.xml @@ -5,6 +5,7 @@ diff --git a/src/en/hentai2read/AndroidManifest.xml b/src/en/hentai2read/AndroidManifest.xml index a0c116d9e..20a0f3b7f 100644 --- a/src/en/hentai2read/AndroidManifest.xml +++ b/src/en/hentai2read/AndroidManifest.xml @@ -6,6 +6,7 @@ diff --git a/src/en/homeheroscans/AndroidManifest.xml b/src/en/homeheroscans/AndroidManifest.xml index 4f931b12b..c0a15c733 100644 --- a/src/en/homeheroscans/AndroidManifest.xml +++ b/src/en/homeheroscans/AndroidManifest.xml @@ -6,6 +6,7 @@ diff --git a/src/en/mangamiso/AndroidManifest.xml b/src/en/mangamiso/AndroidManifest.xml index 64b9d52e5..e0616d4fc 100644 --- a/src/en/mangamiso/AndroidManifest.xml +++ b/src/en/mangamiso/AndroidManifest.xml @@ -6,6 +6,7 @@ diff --git a/src/en/mangamutiny/AndroidManifest.xml b/src/en/mangamutiny/AndroidManifest.xml index dd8605dc3..5bbc61078 100644 --- a/src/en/mangamutiny/AndroidManifest.xml +++ b/src/en/mangamutiny/AndroidManifest.xml @@ -5,6 +5,7 @@ diff --git a/src/en/myhentaigallery/AndroidManifest.xml b/src/en/myhentaigallery/AndroidManifest.xml index 6e4d8d6aa..47c9f7302 100644 --- a/src/en/myhentaigallery/AndroidManifest.xml +++ b/src/en/myhentaigallery/AndroidManifest.xml @@ -6,6 +6,7 @@ diff --git a/src/en/purplecress/AndroidManifest.xml b/src/en/purplecress/AndroidManifest.xml index f0ed63cc6..30310f4f7 100644 --- a/src/en/purplecress/AndroidManifest.xml +++ b/src/en/purplecress/AndroidManifest.xml @@ -6,6 +6,7 @@ diff --git a/src/en/randomscans/AndroidManifest.xml b/src/en/randomscans/AndroidManifest.xml index 91ec28987..166099210 100644 --- a/src/en/randomscans/AndroidManifest.xml +++ b/src/en/randomscans/AndroidManifest.xml @@ -6,6 +6,7 @@ diff --git a/src/en/tsumino/AndroidManifest.xml b/src/en/tsumino/AndroidManifest.xml index 920c8690f..74061a857 100644 --- a/src/en/tsumino/AndroidManifest.xml +++ b/src/en/tsumino/AndroidManifest.xml @@ -6,6 +6,7 @@ diff --git a/src/es/lectormanga/AndroidManifest.xml b/src/es/lectormanga/AndroidManifest.xml index a19251e16..93055d399 100644 --- a/src/es/lectormanga/AndroidManifest.xml +++ b/src/es/lectormanga/AndroidManifest.xml @@ -6,6 +6,7 @@ diff --git a/src/es/tmohentai/AndroidManifest.xml b/src/es/tmohentai/AndroidManifest.xml index 47fe58746..035632324 100644 --- a/src/es/tmohentai/AndroidManifest.xml +++ b/src/es/tmohentai/AndroidManifest.xml @@ -6,6 +6,7 @@ diff --git a/src/es/tumangaonline/AndroidManifest.xml b/src/es/tumangaonline/AndroidManifest.xml index 8706ffc60..7bb9dc39d 100644 --- a/src/es/tumangaonline/AndroidManifest.xml +++ b/src/es/tumangaonline/AndroidManifest.xml @@ -6,6 +6,7 @@ diff --git a/src/ru/desu/AndroidManifest.xml b/src/ru/desu/AndroidManifest.xml index 6bc86da55..880af3062 100644 --- a/src/ru/desu/AndroidManifest.xml +++ b/src/ru/desu/AndroidManifest.xml @@ -6,6 +6,7 @@ diff --git a/src/ru/libmanga/AndroidManifest.xml b/src/ru/libmanga/AndroidManifest.xml index 45feece51..800277ab2 100644 --- a/src/ru/libmanga/AndroidManifest.xml +++ b/src/ru/libmanga/AndroidManifest.xml @@ -6,6 +6,7 @@ diff --git a/src/ru/mintmanga/AndroidManifest.xml b/src/ru/mintmanga/AndroidManifest.xml index 03124de75..79da42000 100644 --- a/src/ru/mintmanga/AndroidManifest.xml +++ b/src/ru/mintmanga/AndroidManifest.xml @@ -6,6 +6,7 @@ diff --git a/src/ru/readmanga/AndroidManifest.xml b/src/ru/readmanga/AndroidManifest.xml index 3164cd86d..8c4582e1e 100644 --- a/src/ru/readmanga/AndroidManifest.xml +++ b/src/ru/readmanga/AndroidManifest.xml @@ -6,6 +6,7 @@ diff --git a/src/ru/remanga/AndroidManifest.xml b/src/ru/remanga/AndroidManifest.xml index ce4748114..5e26c32fe 100644 --- a/src/ru/remanga/AndroidManifest.xml +++ b/src/ru/remanga/AndroidManifest.xml @@ -6,6 +6,7 @@ package="eu.kanade.tachiyomi.extension"> diff --git a/src/zh/baozimanhua/AndroidManifest.xml b/src/zh/baozimanhua/AndroidManifest.xml index 2b35feb12..aa514162e 100644 --- a/src/zh/baozimanhua/AndroidManifest.xml +++ b/src/zh/baozimanhua/AndroidManifest.xml @@ -5,6 +5,7 @@ diff --git a/src/zh/dmzj/AndroidManifest.xml b/src/zh/dmzj/AndroidManifest.xml index 2309c397d..7121a9eb6 100644 --- a/src/zh/dmzj/AndroidManifest.xml +++ b/src/zh/dmzj/AndroidManifest.xml @@ -6,6 +6,7 @@ diff --git a/src/zh/jinmantiantang/AndroidManifest.xml b/src/zh/jinmantiantang/AndroidManifest.xml index e05fdf795..45610d0b9 100644 --- a/src/zh/jinmantiantang/AndroidManifest.xml +++ b/src/zh/jinmantiantang/AndroidManifest.xml @@ -6,6 +6,7 @@ diff --git a/src/zh/kuaikanmanhua/AndroidManifest.xml b/src/zh/kuaikanmanhua/AndroidManifest.xml index 8ec5a7ad2..ed694cc02 100644 --- a/src/zh/kuaikanmanhua/AndroidManifest.xml +++ b/src/zh/kuaikanmanhua/AndroidManifest.xml @@ -5,6 +5,7 @@ diff --git a/src/zh/mangabz/AndroidManifest.xml b/src/zh/mangabz/AndroidManifest.xml index c72853254..f9248f041 100644 --- a/src/zh/mangabz/AndroidManifest.xml +++ b/src/zh/mangabz/AndroidManifest.xml @@ -6,6 +6,7 @@ diff --git a/src/zh/manhuagui/AndroidManifest.xml b/src/zh/manhuagui/AndroidManifest.xml index 43b623083..1fb6b0065 100644 --- a/src/zh/manhuagui/AndroidManifest.xml +++ b/src/zh/manhuagui/AndroidManifest.xml @@ -6,6 +6,7 @@ diff --git a/src/zh/tencentcomics/AndroidManifest.xml b/src/zh/tencentcomics/AndroidManifest.xml index 5a719084a..6ba39c79f 100644 --- a/src/zh/tencentcomics/AndroidManifest.xml +++ b/src/zh/tencentcomics/AndroidManifest.xml @@ -5,6 +5,7 @@