diff --git a/common.gradle b/common.gradle index 2588e8d75..cc384e7e5 100644 --- a/common.gradle +++ b/common.gradle @@ -61,10 +61,15 @@ dependencies { // Lib 1.2, but using specific commit so we don't need to bump up the version compileOnly "com.github.tachiyomiorg:extensions-lib:84bfb8d" + // These are provided by the app itself compileOnly "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" + + compileOnly 'com.github.inorichi.injekt:injekt-core:65b0440' compileOnly 'com.squareup.okhttp3:okhttp:3.10.0' compileOnly 'io.reactivex:rxjava:1.3.6' compileOnly 'org.jsoup:jsoup:1.10.2' + compileOnly 'com.google.code.gson:gson:2.8.2' + compileOnly 'com.github.salomonbrys.kotson:kotson:2.5.0' } preBuild.dependsOn(lintKotlin) diff --git a/src/all/ciayo/build.gradle b/src/all/ciayo/build.gradle index 007c4bf0f..cf162919a 100644 --- a/src/all/ciayo/build.gradle +++ b/src/all/ciayo/build.gradle @@ -9,9 +9,4 @@ ext { libVersion = '1.2' } -dependencies { - compileOnly 'com.google.code.gson:gson:2.8.2' - compileOnly 'com.github.salomonbrys.kotson:kotson:2.5.0' -} - apply from: "$rootDir/common.gradle" diff --git a/src/all/foolslide/build.gradle b/src/all/foolslide/build.gradle index 322857ed9..33a5017bf 100644 --- a/src/all/foolslide/build.gradle +++ b/src/all/foolslide/build.gradle @@ -9,10 +9,4 @@ ext { libVersion = '1.2' } -dependencies { - compileOnly 'com.google.code.gson:gson:2.8.2' - compileOnly 'com.github.salomonbrys.kotson:kotson:2.5.0' - compileOnly 'com.github.inorichi.injekt:injekt-core:65b0440' -} - apply from: "$rootDir/common.gradle" diff --git a/src/all/komga/build.gradle b/src/all/komga/build.gradle index 87bd8e2ad..429ef8f12 100644 --- a/src/all/komga/build.gradle +++ b/src/all/komga/build.gradle @@ -10,9 +10,6 @@ ext { } dependencies { - compileOnly 'com.google.code.gson:gson:2.8.2' - compileOnly 'com.github.salomonbrys.kotson:kotson:2.5.0' - compileOnly 'com.github.inorichi.injekt:injekt-core:65b0440' implementation 'io.reactivex:rxandroid:1.2.1' implementation 'io.reactivex:rxjava:1.3.6' } diff --git a/src/all/lanraragi/build.gradle b/src/all/lanraragi/build.gradle index 098081413..b3b375c5c 100644 --- a/src/all/lanraragi/build.gradle +++ b/src/all/lanraragi/build.gradle @@ -9,10 +9,4 @@ ext { libVersion = '1.2' } -dependencies { - compileOnly 'com.github.inorichi.injekt:injekt-core:65b0440' - compileOnly 'com.google.code.gson:gson:2.8.2' - compileOnly 'com.github.salomonbrys.kotson:kotson:2.5.0' -} - apply from: "$rootDir/common.gradle" diff --git a/src/all/mangabox/src/eu/kanade/tachiyomi/extension/all/mangabox/MangaBoxFactory.kt b/src/all/mangabox/src/eu/kanade/tachiyomi/extension/all/mangabox/MangaBoxFactory.kt index d66ac487b..9f88037dc 100644 --- a/src/all/mangabox/src/eu/kanade/tachiyomi/extension/all/mangabox/MangaBoxFactory.kt +++ b/src/all/mangabox/src/eu/kanade/tachiyomi/extension/all/mangabox/MangaBoxFactory.kt @@ -7,9 +7,9 @@ import eu.kanade.tachiyomi.source.model.Filter import eu.kanade.tachiyomi.source.model.FilterList import eu.kanade.tachiyomi.source.model.MangasPage import eu.kanade.tachiyomi.util.asJsoup -import okhttp3.Headers import java.text.SimpleDateFormat import java.util.Locale +import okhttp3.Headers import okhttp3.Request import okhttp3.Response diff --git a/src/all/mangadex/build.gradle b/src/all/mangadex/build.gradle index 7f33ebf7b..cd2b543f3 100644 --- a/src/all/mangadex/build.gradle +++ b/src/all/mangadex/build.gradle @@ -11,9 +11,6 @@ ext { dependencies { implementation project(':lib-ratelimit') - compileOnly 'com.google.code.gson:gson:2.8.2' - compileOnly 'com.github.salomonbrys.kotson:kotson:2.5.0' - compileOnly 'com.github.inorichi.injekt:injekt-core:65b0440' } apply from: "$rootDir/common.gradle" diff --git a/src/all/mangaplus/build.gradle b/src/all/mangaplus/build.gradle index 1b282bd0a..aee3f77dc 100644 --- a/src/all/mangaplus/build.gradle +++ b/src/all/mangaplus/build.gradle @@ -13,9 +13,7 @@ ext { dependencies { implementation 'org.jetbrains.kotlinx:kotlinx-serialization-protobuf:0.20.0' implementation 'org.jetbrains.kotlinx:kotlinx-serialization-runtime:0.20.0' - compileOnly 'com.google.code.gson:gson:2.8.2' compileOnly project(':duktape-stub') - compileOnly 'com.github.inorichi.injekt:injekt-core:65b0440' } apply from: "$rootDir/common.gradle" diff --git a/src/all/mmrcms/build.gradle b/src/all/mmrcms/build.gradle index 2cb77b085..a34e4c7e8 100644 --- a/src/all/mmrcms/build.gradle +++ b/src/all/mmrcms/build.gradle @@ -9,9 +9,4 @@ ext { libVersion = '1.2' } -dependencies { - compileOnly 'com.google.code.gson:gson:2.8.2' - compileOnly 'com.github.salomonbrys.kotson:kotson:2.5.0' -} - apply from: "$rootDir/common.gradle" diff --git a/src/all/nhentai/build.gradle b/src/all/nhentai/build.gradle index a3944e196..eafa68771 100644 --- a/src/all/nhentai/build.gradle +++ b/src/all/nhentai/build.gradle @@ -9,8 +9,4 @@ ext { libVersion = '1.2' } -dependencies { - compileOnly 'com.github.inorichi.injekt:injekt-core:65b0440' -} - apply from: "$rootDir/common.gradle" diff --git a/src/all/ninehentai/build.gradle b/src/all/ninehentai/build.gradle index dec5195df..cf168f0b1 100644 --- a/src/all/ninehentai/build.gradle +++ b/src/all/ninehentai/build.gradle @@ -8,9 +8,5 @@ ext { extVersionCode = 6 libVersion = '1.2' } -dependencies { - compileOnly 'com.google.code.gson:gson:2.8.2' - compileOnly 'com.github.salomonbrys.kotson:kotson:2.5.0' - compileOnly 'com.github.inorichi.injekt:injekt-core:65b0440' -} + apply from: "$rootDir/common.gradle" diff --git a/src/all/simplyhentai/build.gradle b/src/all/simplyhentai/build.gradle index 08f5c2f29..e0ad545e8 100644 --- a/src/all/simplyhentai/build.gradle +++ b/src/all/simplyhentai/build.gradle @@ -9,9 +9,4 @@ ext { libVersion = '1.2' } -dependencies { - compileOnly 'com.google.code.gson:gson:2.8.2' - compileOnly 'com.github.salomonbrys.kotson:kotson:2.5.0' -} - apply from: "$rootDir/common.gradle" diff --git a/src/all/wpmangastream/build.gradle b/src/all/wpmangastream/build.gradle index e98af476e..498abfa88 100644 --- a/src/all/wpmangastream/build.gradle +++ b/src/all/wpmangastream/build.gradle @@ -11,6 +11,6 @@ ext { dependencies { implementation project(':lib-ratelimit') - compileOnly 'com.github.inorichi.injekt:injekt-core:65b0440' } + apply from: "$rootDir/common.gradle" diff --git a/src/de/mangatube/build.gradle b/src/de/mangatube/build.gradle index 648cb7c41..0defdd118 100644 --- a/src/de/mangatube/build.gradle +++ b/src/de/mangatube/build.gradle @@ -9,9 +9,4 @@ ext { libVersion = '1.2' } -dependencies { - compileOnly 'com.google.code.gson:gson:2.8.2' - compileOnly 'com.github.salomonbrys.kotson:kotson:2.5.0' -} - apply from: "$rootDir/common.gradle" diff --git a/src/en/guya/build.gradle b/src/en/guya/build.gradle index 4b00a2491..11aeb6d74 100644 --- a/src/en/guya/build.gradle +++ b/src/en/guya/build.gradle @@ -9,8 +9,4 @@ ext { libVersion = '1.2' } -dependencies { - compileOnly 'com.github.inorichi.injekt:injekt-core:65b0440' -} - apply from: "$rootDir/common.gradle" diff --git a/src/en/honkaiimpact3/build.gradle b/src/en/honkaiimpact3/build.gradle index eb57a70e2..b986e8870 100644 --- a/src/en/honkaiimpact3/build.gradle +++ b/src/en/honkaiimpact3/build.gradle @@ -9,9 +9,4 @@ ext { libVersion = '1.2' } -dependencies { - compileOnly 'com.google.code.gson:gson:2.8.2' - compileOnly 'com.github.salomonbrys.kotson:kotson:2.5.0' -} - apply from: "$rootDir/common.gradle" diff --git a/src/en/inkr/build.gradle b/src/en/inkr/build.gradle index 6cdc50813..28e6c94f9 100644 --- a/src/en/inkr/build.gradle +++ b/src/en/inkr/build.gradle @@ -9,8 +9,4 @@ ext { libVersion = '1.2' } -dependencies { - compileOnly 'com.github.salomonbrys.kotson:kotson:2.5.0' -} - apply from: "$rootDir/common.gradle" diff --git a/src/en/mangadog/build.gradle b/src/en/mangadog/build.gradle index c385b9444..aa3648947 100644 --- a/src/en/mangadog/build.gradle +++ b/src/en/mangadog/build.gradle @@ -9,9 +9,4 @@ ext { libVersion = '1.2' } -dependencies { - compileOnly 'com.google.code.gson:gson:2.8.2' - compileOnly 'com.github.salomonbrys.kotson:kotson:2.5.0' -} - apply from: "$rootDir/common.gradle" diff --git a/src/en/mangahasu/build.gradle b/src/en/mangahasu/build.gradle index 715273fd9..efecfb705 100644 --- a/src/en/mangahasu/build.gradle +++ b/src/en/mangahasu/build.gradle @@ -9,9 +9,4 @@ ext { libVersion = '1.2' } -dependencies { - compileOnly 'com.google.code.gson:gson:2.8.2' - compileOnly 'com.github.salomonbrys.kotson:kotson:2.5.0' -} - apply from: "$rootDir/common.gradle" diff --git a/src/en/mangahere/build.gradle b/src/en/mangahere/build.gradle index 955a4e6ee..9bab93099 100644 --- a/src/en/mangahere/build.gradle +++ b/src/en/mangahere/build.gradle @@ -11,8 +11,6 @@ ext { dependencies { compileOnly project(':duktape-stub') - sourceCompatibility = "1.6" - targetCompatibility = "1.6" } apply from: "$rootDir/common.gradle" diff --git a/src/en/mangahub/build.gradle b/src/en/mangahub/build.gradle index 65d0fde21..082f981a7 100644 --- a/src/en/mangahub/build.gradle +++ b/src/en/mangahub/build.gradle @@ -9,9 +9,4 @@ ext { libVersion = '1.2' } -dependencies { - compileOnly 'com.google.code.gson:gson:2.8.2' - compileOnly 'com.github.salomonbrys.kotson:kotson:2.5.0' -} - apply from: "$rootDir/common.gradle" diff --git a/src/en/mangakatana/src/eu/kanade/tachiyomi/extension/en/mangakatana/MangaKatana.kt b/src/en/mangakatana/src/eu/kanade/tachiyomi/extension/en/mangakatana/MangaKatana.kt index 877aadb57..26090f116 100644 --- a/src/en/mangakatana/src/eu/kanade/tachiyomi/extension/en/mangakatana/MangaKatana.kt +++ b/src/en/mangakatana/src/eu/kanade/tachiyomi/extension/en/mangakatana/MangaKatana.kt @@ -6,12 +6,12 @@ import eu.kanade.tachiyomi.source.model.Page import eu.kanade.tachiyomi.source.model.SChapter import eu.kanade.tachiyomi.source.model.SManga import eu.kanade.tachiyomi.source.online.ParsedHttpSource -import org.jsoup.nodes.Document -import org.jsoup.nodes.Element import java.text.SimpleDateFormat import java.util.Locale +import org.jsoup.nodes.Document +import org.jsoup.nodes.Element -class MangaKatana: ParsedHttpSource() { +class MangaKatana : ParsedHttpSource() { override val name = "MangaKatana" override val baseUrl = "https://mangakatana.com" @@ -81,7 +81,7 @@ class MangaKatana: ParsedHttpSource() { override fun pageListParse(document: Document): List { val html = document.toString() - //Thanks to https://github.com/manga-py/manga-py + // Thanks to https://github.com/manga-py/manga-py val regex = Regex("var\\s+\\w+\\s?=\\s?(\\[['\"].+?['\"]).?\\]\\s?;") val match = regex.find(html)?.destructured?.toList()?.get(0)?.removePrefix("[") @@ -94,4 +94,3 @@ class MangaKatana: ParsedHttpSource() { override fun getFilterList() = FilterList() } - diff --git a/src/en/mangakisa/build.gradle b/src/en/mangakisa/build.gradle index 11f5365fa..b3856569a 100644 --- a/src/en/mangakisa/build.gradle +++ b/src/en/mangakisa/build.gradle @@ -9,8 +9,4 @@ ext { libVersion = '1.2' } -dependencies { - compileOnly 'com.github.inorichi.injekt:injekt-core:65b0440' -} - apply from: "$rootDir/common.gradle" diff --git a/src/en/mangalife/build.gradle b/src/en/mangalife/build.gradle index 9378b17b6..4f016f53f 100644 --- a/src/en/mangalife/build.gradle +++ b/src/en/mangalife/build.gradle @@ -9,9 +9,4 @@ ext { libVersion = '1.2' } -dependencies { - compileOnly 'com.google.code.gson:gson:2.8.2' - compileOnly 'com.github.salomonbrys.kotson:kotson:2.5.0' -} - apply from: "$rootDir/common.gradle" diff --git a/src/en/mangalinkz/build.gradle b/src/en/mangalinkz/build.gradle index 6bbb682c0..b0eacbde8 100644 --- a/src/en/mangalinkz/build.gradle +++ b/src/en/mangalinkz/build.gradle @@ -9,9 +9,4 @@ ext { libVersion = '1.2' } -dependencies { - compileOnly 'com.google.code.gson:gson:2.8.2' - compileOnly 'com.github.salomonbrys.kotson:kotson:2.5.0' -} - apply from: "$rootDir/common.gradle" diff --git a/src/en/mangapark/build.gradle b/src/en/mangapark/build.gradle index 481fbe855..47505b0b2 100644 --- a/src/en/mangapark/build.gradle +++ b/src/en/mangapark/build.gradle @@ -9,8 +9,4 @@ ext { libVersion = '1.2' } -dependencies { - compileOnly 'com.github.inorichi.injekt:injekt-core:65b0440' -} - apply from: "$rootDir/common.gradle" diff --git a/src/en/mangarockes/build.gradle b/src/en/mangarockes/build.gradle index f1ebfc77d..9bb8c0611 100644 --- a/src/en/mangarockes/build.gradle +++ b/src/en/mangarockes/build.gradle @@ -9,9 +9,4 @@ ext { libVersion = '1.2' } -dependencies { - compileOnly 'com.google.code.gson:gson:2.8.2' - compileOnly 'com.github.salomonbrys.kotson:kotson:2.5.0' -} - apply from: "$rootDir/common.gradle" diff --git a/src/en/mangasail/build.gradle b/src/en/mangasail/build.gradle index f3cd572e1..fb9d47087 100644 --- a/src/en/mangasail/build.gradle +++ b/src/en/mangasail/build.gradle @@ -9,9 +9,4 @@ ext { libVersion = '1.2' } -dependencies { - compileOnly 'com.google.code.gson:gson:2.8.2' - compileOnly 'com.github.salomonbrys.kotson:kotson:2.5.0' -} - apply from: "$rootDir/common.gradle" diff --git a/src/en/myanimelist/build.gradle b/src/en/myanimelist/build.gradle index b9cc7fcdf..b3e1c4cda 100644 --- a/src/en/myanimelist/build.gradle +++ b/src/en/myanimelist/build.gradle @@ -9,9 +9,4 @@ ext { libVersion = '1.2' } -dependencies { - compileOnly 'com.google.code.gson:gson:2.8.2' - compileOnly 'com.github.salomonbrys.kotson:kotson:2.5.0' -} - apply from: "$rootDir/common.gradle" diff --git a/src/en/readcomiconline/build.gradle b/src/en/readcomiconline/build.gradle index 0a5de6190..0fc43029d 100644 --- a/src/en/readcomiconline/build.gradle +++ b/src/en/readcomiconline/build.gradle @@ -9,8 +9,4 @@ ext { libVersion = '1.2' } -dependencies { - compileOnly 'com.github.inorichi.injekt:injekt-core:65b0440' -} - apply from: "$rootDir/common.gradle" diff --git a/src/en/readmanhwa/build.gradle b/src/en/readmanhwa/build.gradle index 0a2bb126e..e594410a8 100644 --- a/src/en/readmanhwa/build.gradle +++ b/src/en/readmanhwa/build.gradle @@ -9,9 +9,4 @@ ext { libVersion = '1.2' } -dependencies { - compileOnly 'com.google.code.gson:gson:2.8.2' - compileOnly 'com.github.salomonbrys.kotson:kotson:2.5.0' -} - apply from: "$rootDir/common.gradle" diff --git a/src/en/renascans/build.gradle b/src/en/renascans/build.gradle index f3e30927d..5e0baabd7 100644 --- a/src/en/renascans/build.gradle +++ b/src/en/renascans/build.gradle @@ -9,9 +9,4 @@ ext { libVersion = '1.2' } -dependencies { - compileOnly 'com.google.code.gson:gson:2.8.2' - compileOnly 'com.github.salomonbrys.kotson:kotson:2.5.0' -} - apply from: "$rootDir/common.gradle" diff --git a/src/en/tapastic/build.gradle b/src/en/tapastic/build.gradle index 7d9746870..c1263e4bc 100644 --- a/src/en/tapastic/build.gradle +++ b/src/en/tapastic/build.gradle @@ -9,10 +9,4 @@ ext { libVersion = '1.2' } -dependencies { - compileOnly 'com.google.code.gson:gson:2.8.2' - compileOnly 'com.github.salomonbrys.kotson:kotson:2.5.0' - compileOnly 'com.github.inorichi.injekt:injekt-core:65b0440' -} - apply from: "$rootDir/common.gradle" diff --git a/src/en/tsumino/build.gradle b/src/en/tsumino/build.gradle index cac6ee4b5..f3ce3256b 100644 --- a/src/en/tsumino/build.gradle +++ b/src/en/tsumino/build.gradle @@ -9,9 +9,4 @@ ext { libVersion = '1.2' } -dependencies { - compileOnly 'com.google.code.gson:gson:2.8.2' - compileOnly 'com.github.salomonbrys.kotson:kotson:2.5.0' -} - apply from: "$rootDir/common.gradle" diff --git a/src/en/wutopia/build.gradle b/src/en/wutopia/build.gradle index a156308d4..8015184ab 100644 --- a/src/en/wutopia/build.gradle +++ b/src/en/wutopia/build.gradle @@ -9,9 +9,4 @@ ext { libVersion = '1.2' } -dependencies { - compileOnly 'com.google.code.gson:gson:2.8.2' - compileOnly 'com.github.salomonbrys.kotson:kotson:2.5.0' -} - apply from: "$rootDir/common.gradle" diff --git a/src/es/doujinyang/build.gradle b/src/es/doujinyang/build.gradle index 58917763f..4c6c359d3 100644 --- a/src/es/doujinyang/build.gradle +++ b/src/es/doujinyang/build.gradle @@ -9,9 +9,4 @@ ext { libVersion = '1.2' } -dependencies { - compileOnly 'com.google.code.gson:gson:2.8.2' - compileOnly 'com.github.salomonbrys.kotson:kotson:2.5.0' -} - apply from: "$rootDir/common.gradle" diff --git a/src/es/heavenmanga/src/eu/kanade/tachiyomi/extension/es/heavenmanga/HeavenManga.kt b/src/es/heavenmanga/src/eu/kanade/tachiyomi/extension/es/heavenmanga/HeavenManga.kt index 94c8d0296..7b60879a8 100644 --- a/src/es/heavenmanga/src/eu/kanade/tachiyomi/extension/es/heavenmanga/HeavenManga.kt +++ b/src/es/heavenmanga/src/eu/kanade/tachiyomi/extension/es/heavenmanga/HeavenManga.kt @@ -129,11 +129,10 @@ class HeavenManga : ParsedHttpSource() { setUrlWithoutDomain(it.attr("href")) } scanlator = element.select("span.pull-right").text() - } } - override fun mangaDetailsParse(document: Document) = SManga.create().apply { + override fun mangaDetailsParse(document: Document) = SManga.create().apply { document.select("div.tab-summary").let { info -> genre = info.select("div.genres-content a").joinToString { it.text() } thumbnail_url = info.select("div.summary_image img").attr("abs:data-src") @@ -151,7 +150,7 @@ class HeavenManga : ParsedHttpSource() { override fun pageListParse(document: Document): List { return document.select("script:containsData(pUrl)").first().data() .substringAfter("pUrl=[").substringBefore("\"},];").split("\"},") - .mapIndexed{ i, string -> Page(i, "", string.substringAfterLast("\"")) } + .mapIndexed { i, string -> Page(i, "", string.substringAfterLast("\"")) } } /** diff --git a/src/es/inmanga/build.gradle b/src/es/inmanga/build.gradle index b478507d1..dd6918456 100644 --- a/src/es/inmanga/build.gradle +++ b/src/es/inmanga/build.gradle @@ -9,9 +9,4 @@ ext { libVersion = '1.2' } -dependencies { - compileOnly 'com.google.code.gson:gson:2.8.2' - compileOnly 'com.github.salomonbrys.kotson:kotson:2.5.0' -} - apply from: "$rootDir/common.gradle" diff --git a/src/es/lectormanga/build.gradle b/src/es/lectormanga/build.gradle index a37b1360d..4643de552 100755 --- a/src/es/lectormanga/build.gradle +++ b/src/es/lectormanga/build.gradle @@ -9,8 +9,4 @@ ext { libVersion = '1.2' } -dependencies { - compileOnly 'com.github.inorichi.injekt:injekt-core:65b0440' -} - apply from: "$rootDir/common.gradle" diff --git a/src/es/mangamx/build.gradle b/src/es/mangamx/build.gradle index ea8fdca84..a7cbbddc9 100644 --- a/src/es/mangamx/build.gradle +++ b/src/es/mangamx/build.gradle @@ -9,9 +9,4 @@ ext { libVersion = '1.2' } -dependencies { - compileOnly 'com.google.code.gson:gson:2.8.2' - compileOnly 'com.github.salomonbrys.kotson:kotson:2.5.0' -} - apply from: "$rootDir/common.gradle" diff --git a/src/es/tumangaonline/build.gradle b/src/es/tumangaonline/build.gradle index 753965841..6cf9066b8 100644 --- a/src/es/tumangaonline/build.gradle +++ b/src/es/tumangaonline/build.gradle @@ -9,8 +9,4 @@ ext { libVersion = '1.2' } -dependencies { - compileOnly 'com.github.inorichi.injekt:injekt-core:65b0440' -} - apply from: "$rootDir/common.gradle" diff --git a/src/fr/japscan/build.gradle b/src/fr/japscan/build.gradle index 4757f41e4..eda564d0b 100644 --- a/src/fr/japscan/build.gradle +++ b/src/fr/japscan/build.gradle @@ -9,10 +9,8 @@ ext { libVersion = '1.2' } -apply from: "$rootDir/common.gradle" - dependencies { implementation 'org.apache.commons:commons-lang3:3.8.1' - compileOnly 'com.google.code.gson:gson:2.8.2' - compileOnly 'com.github.salomonbrys.kotson:kotson:2.5.0' } + +apply from: "$rootDir/common.gradle" diff --git a/src/id/mangaindo/build.gradle b/src/id/mangaindo/build.gradle index ae682cdc4..f2a6f53e5 100644 --- a/src/id/mangaindo/build.gradle +++ b/src/id/mangaindo/build.gradle @@ -9,9 +9,4 @@ ext { libVersion = '1.2' } -dependencies { - compileOnly 'com.google.code.gson:gson:2.8.2' - compileOnly 'com.github.salomonbrys.kotson:kotson:2.5.0' -} - apply from: "$rootDir/common.gradle" diff --git a/src/ja/mangaraw/src/eu/kanade/tachiyomi/extension/ja/mangaraw/MangaRaw.kt b/src/ja/mangaraw/src/eu/kanade/tachiyomi/extension/ja/mangaraw/MangaRaw.kt index ba5b6dd1c..a27164632 100644 --- a/src/ja/mangaraw/src/eu/kanade/tachiyomi/extension/ja/mangaraw/MangaRaw.kt +++ b/src/ja/mangaraw/src/eu/kanade/tachiyomi/extension/ja/mangaraw/MangaRaw.kt @@ -6,8 +6,6 @@ import eu.kanade.tachiyomi.source.model.Page import eu.kanade.tachiyomi.source.model.SChapter import eu.kanade.tachiyomi.source.model.SManga import eu.kanade.tachiyomi.source.online.ParsedHttpSource -import java.util.Calendar -import okhttp3.OkHttpClient import okhttp3.Protocol import org.jsoup.nodes.Document import org.jsoup.nodes.Element diff --git a/src/ja/mangaraw/src/eu/kanade/tachiyomi/extension/ja/mangaraw/MangaRawFactory.kt b/src/ja/mangaraw/src/eu/kanade/tachiyomi/extension/ja/mangaraw/MangaRawFactory.kt index b4a4cf4da..f9fa78cef 100644 --- a/src/ja/mangaraw/src/eu/kanade/tachiyomi/extension/ja/mangaraw/MangaRawFactory.kt +++ b/src/ja/mangaraw/src/eu/kanade/tachiyomi/extension/ja/mangaraw/MangaRawFactory.kt @@ -3,12 +3,12 @@ package eu.kanade.tachiyomi.extension.ja.mangaraw import eu.kanade.tachiyomi.source.Source import eu.kanade.tachiyomi.source.SourceFactory -class MangaRawFactory: SourceFactory { +class MangaRawFactory : SourceFactory { override fun createSources(): List = listOf( Manga1000(), Manga1001() ) } -class Manga1000: MangaRaw("Manga1000", "http://manga1000.com") -class Manga1001: MangaRaw("Manga1001", "http://manga1001.com") +class Manga1000 : MangaRaw("Manga1000", "http://manga1000.com") +class Manga1001 : MangaRaw("Manga1001", "http://manga1001.com") diff --git a/src/ja/shonenjumpplus/build.gradle b/src/ja/shonenjumpplus/build.gradle index c2582bcd2..c2f542803 100644 --- a/src/ja/shonenjumpplus/build.gradle +++ b/src/ja/shonenjumpplus/build.gradle @@ -9,9 +9,4 @@ ext { libVersion = '1.2' } -dependencies { - compileOnly 'com.google.code.gson:gson:2.8.2' - compileOnly 'com.github.salomonbrys.kotson:kotson:2.5.0' -} - apply from: "$rootDir/common.gradle" diff --git a/src/ko/jmana/build.gradle b/src/ko/jmana/build.gradle index 62e57795f..d55ac36c9 100644 --- a/src/ko/jmana/build.gradle +++ b/src/ko/jmana/build.gradle @@ -9,8 +9,4 @@ ext { libVersion = '1.2' } -dependencies { - compileOnly 'com.github.inorichi.injekt:injekt-core:65b0440' -} - apply from: "$rootDir/common.gradle" diff --git a/src/ko/mangashowme/build.gradle b/src/ko/mangashowme/build.gradle index da0ccf41d..bda40eb7c 100644 --- a/src/ko/mangashowme/build.gradle +++ b/src/ko/mangashowme/build.gradle @@ -9,8 +9,4 @@ ext { libVersion = '1.2' } -dependencies { - compileOnly 'com.github.inorichi.injekt:injekt-core:65b0440' -} - apply from: "$rootDir/common.gradle" diff --git a/src/ko/newtoki/build.gradle b/src/ko/newtoki/build.gradle index ac70fd5f0..22cc0cde2 100644 --- a/src/ko/newtoki/build.gradle +++ b/src/ko/newtoki/build.gradle @@ -9,8 +9,4 @@ ext { libVersion = '1.2' } -dependencies { - compileOnly 'com.github.inorichi.injekt:injekt-core:65b0440' -} - apply from: "$rootDir/common.gradle" diff --git a/src/pt/animaregia/build.gradle b/src/pt/animaregia/build.gradle index e8daf0616..a92bad704 100644 --- a/src/pt/animaregia/build.gradle +++ b/src/pt/animaregia/build.gradle @@ -9,9 +9,4 @@ ext { libVersion = '1.2' } -dependencies { - compileOnly 'com.google.code.gson:gson:2.8.2' - compileOnly 'com.github.salomonbrys.kotson:kotson:2.5.0' -} - apply from: "$rootDir/common.gradle" diff --git a/src/pt/centraldemangas/build.gradle b/src/pt/centraldemangas/build.gradle index 5ed8d6a73..5cc22df79 100644 --- a/src/pt/centraldemangas/build.gradle +++ b/src/pt/centraldemangas/build.gradle @@ -9,9 +9,4 @@ ext { libVersion = '1.2' } -dependencies { - compileOnly 'com.google.code.gson:gson:2.8.2' - compileOnly 'com.github.salomonbrys.kotson:kotson:2.5.0' -} - apply from: "$rootDir/common.gradle" diff --git a/src/pt/hipercool/build.gradle b/src/pt/hipercool/build.gradle index 5a8fd058b..6d30f2a79 100644 --- a/src/pt/hipercool/build.gradle +++ b/src/pt/hipercool/build.gradle @@ -9,9 +9,4 @@ ext { libVersion = '1.2' } -dependencies { - compileOnly 'com.google.code.gson:gson:2.8.2' - compileOnly 'com.github.salomonbrys.kotson:kotson:2.5.0' -} - apply from: "$rootDir/common.gradle" diff --git a/src/pt/hqnow/build.gradle b/src/pt/hqnow/build.gradle index b60131894..7318c12dc 100644 --- a/src/pt/hqnow/build.gradle +++ b/src/pt/hqnow/build.gradle @@ -9,9 +9,4 @@ ext { libVersion = '1.2' } -dependencies { - compileOnly 'com.google.code.gson:gson:2.8.2' - compileOnly 'com.github.salomonbrys.kotson:kotson:2.5.0' -} - apply from: "$rootDir/common.gradle" diff --git a/src/pt/mangasproject/build.gradle b/src/pt/mangasproject/build.gradle index 812f93fff..91678adf0 100644 --- a/src/pt/mangasproject/build.gradle +++ b/src/pt/mangasproject/build.gradle @@ -9,9 +9,4 @@ ext { libVersion = '1.2' } -dependencies { - compileOnly 'com.google.code.gson:gson:2.8.2' - compileOnly 'com.github.salomonbrys.kotson:kotson:2.5.0' -} - apply from: "$rootDir/common.gradle" diff --git a/src/pt/supermangas/build.gradle b/src/pt/supermangas/build.gradle index 5660ca0fb..a314cab3c 100644 --- a/src/pt/supermangas/build.gradle +++ b/src/pt/supermangas/build.gradle @@ -9,9 +9,4 @@ ext { libVersion = '1.2' } -dependencies { - compileOnly 'com.google.code.gson:gson:2.8.2' - compileOnly 'com.github.salomonbrys.kotson:kotson:2.5.0' -} - apply from: "$rootDir/common.gradle" diff --git a/src/pt/tsukimangas/build.gradle b/src/pt/tsukimangas/build.gradle index 11bba5adf..2798c398a 100644 --- a/src/pt/tsukimangas/build.gradle +++ b/src/pt/tsukimangas/build.gradle @@ -10,8 +10,6 @@ ext { } dependencies { - compileOnly 'com.google.code.gson:gson:2.8.2' - compileOnly 'com.github.salomonbrys.kotson:kotson:2.5.0' implementation project(':lib-ratelimit') } diff --git a/src/pt/unionmangas/build.gradle b/src/pt/unionmangas/build.gradle index 9299e40ee..7244fd82b 100644 --- a/src/pt/unionmangas/build.gradle +++ b/src/pt/unionmangas/build.gradle @@ -9,9 +9,4 @@ ext { libVersion = '1.2' } -dependencies { - compileOnly 'com.google.code.gson:gson:2.8.2' - compileOnly 'com.github.salomonbrys.kotson:kotson:2.5.0' -} - apply from: "$rootDir/common.gradle" diff --git a/src/ru/anibe/build.gradle b/src/ru/anibe/build.gradle index 2bbbaff68..6210b65a9 100644 --- a/src/ru/anibe/build.gradle +++ b/src/ru/anibe/build.gradle @@ -9,9 +9,4 @@ ext { libVersion = '1.2' } -dependencies { - compileOnly 'com.google.code.gson:gson:2.8.2' - compileOnly 'com.github.salomonbrys.kotson:kotson:2.5.0' -} - apply from: "$rootDir/common.gradle" diff --git a/src/ru/henchan/build.gradle b/src/ru/henchan/build.gradle index 256012b6a..f8c67895b 100644 --- a/src/ru/henchan/build.gradle +++ b/src/ru/henchan/build.gradle @@ -8,11 +8,9 @@ ext { extVersionCode = 16 libVersion = '1.2' } + dependencies { - compileOnly 'com.google.code.gson:gson:2.8.2' - compileOnly 'com.github.salomonbrys.kotson:kotson:2.5.0' - implementation project(':lib-ratelimit') - } + apply from: "$rootDir/common.gradle" diff --git a/src/ru/libmanga/build.gradle b/src/ru/libmanga/build.gradle index 96f9263a7..a3b588a1e 100644 --- a/src/ru/libmanga/build.gradle +++ b/src/ru/libmanga/build.gradle @@ -9,10 +9,4 @@ ext { libVersion = '1.2' } -dependencies { - compileOnly 'com.google.code.gson:gson:2.8.2' - compileOnly 'com.github.salomonbrys.kotson:kotson:2.5.0' - compileOnly 'com.github.inorichi.injekt:injekt-core:65b0440' -} - apply from: "$rootDir/common.gradle" diff --git a/src/ru/mangahub/build.gradle b/src/ru/mangahub/build.gradle index 2fd4cc8e1..650be8359 100644 --- a/src/ru/mangahub/build.gradle +++ b/src/ru/mangahub/build.gradle @@ -11,7 +11,6 @@ ext { dependencies { implementation project(':lib-ratelimit') - compileOnly 'com.google.code.gson:gson:2.8.2' } apply from: "$rootDir/common.gradle" diff --git a/src/ru/mangaonlinebiz/build.gradle b/src/ru/mangaonlinebiz/build.gradle index 0813e2028..227c02323 100644 --- a/src/ru/mangaonlinebiz/build.gradle +++ b/src/ru/mangaonlinebiz/build.gradle @@ -9,10 +9,4 @@ ext { libVersion = '1.2' } -dependencies { - compileOnly 'com.google.code.gson:gson:2.8.2' - compileOnly 'com.github.salomonbrys.kotson:kotson:2.5.0' - compileOnly 'com.github.inorichi.injekt:injekt-core:65b0440' -} - apply from: "$rootDir/common.gradle" diff --git a/src/ru/risensteam/build.gradle b/src/ru/risensteam/build.gradle index 84decd2f3..163de7c1b 100644 --- a/src/ru/risensteam/build.gradle +++ b/src/ru/risensteam/build.gradle @@ -8,8 +8,5 @@ ext { extVersionCode = 1 libVersion = '1.2' } -dependencies { - compileOnly 'com.google.code.gson:gson:2.8.2' - compileOnly 'com.github.salomonbrys.kotson:kotson:2.5.0' -} + apply from: "$rootDir/common.gradle" diff --git a/src/tr/MangaDenizi/src/eu/kanade/tachiyomi/extension/tr/mangadenizi/MangaDenizi.kt b/src/tr/MangaDenizi/src/eu/kanade/tachiyomi/extension/tr/mangadenizi/MangaDenizi.kt index 6b5f4eb56..3d44a6827 100644 --- a/src/tr/MangaDenizi/src/eu/kanade/tachiyomi/extension/tr/mangadenizi/MangaDenizi.kt +++ b/src/tr/MangaDenizi/src/eu/kanade/tachiyomi/extension/tr/mangadenizi/MangaDenizi.kt @@ -11,9 +11,9 @@ import eu.kanade.tachiyomi.util.asJsoup import java.text.SimpleDateFormat import java.util.Locale import okhttp3.Response +import org.json.JSONObject import org.jsoup.nodes.Document import org.jsoup.nodes.Element -import org.json.JSONObject class MangaDenizi : ParsedHttpSource() { override val name = "MangaDenizi" @@ -42,7 +42,7 @@ class MangaDenizi : ParsedHttpSource() { override fun latestUpdatesRequest(page: Int) = GET("$baseUrl/latest-release?page=$page", headers) - //No thumbnail on latest releases page + // No thumbnail on latest releases page override fun latestUpdatesFromElement(element: Element) = SManga.create().apply { setUrlWithoutDomain(element.attr("href")) title = element.text() @@ -79,7 +79,7 @@ class MangaDenizi : ParsedHttpSource() { val results = response.getJSONArray("suggestions") val mangas = ArrayList() - //No thumbnail here either + // No thumbnail here either for (i in 0 until results.length()) { val obj = results.getJSONObject(i) val manga = SManga.create() diff --git a/src/tr/serimanga/src/eu/kanade/tachiyomi/extension/tr/serimanga/SeriManga.kt b/src/tr/serimanga/src/eu/kanade/tachiyomi/extension/tr/serimanga/SeriManga.kt index 527f18577..09aa65cec 100644 --- a/src/tr/serimanga/src/eu/kanade/tachiyomi/extension/tr/serimanga/SeriManga.kt +++ b/src/tr/serimanga/src/eu/kanade/tachiyomi/extension/tr/serimanga/SeriManga.kt @@ -88,8 +88,8 @@ class SeriManga : ParsedHttpSource() { var continueParsing = true while (continueParsing) { - document.select(chapterListSelector()).map{ chapters.add(chapterFromElement(it)) } - document.select(popularMangaNextPageSelector()).let{ + document.select(chapterListSelector()).map { chapters.add(chapterFromElement(it)) } + document.select(popularMangaNextPageSelector()).let { if (it.isNotEmpty()) { document = client.newCall(GET(it.attr("abs:href"), headers)).execute().asJsoup() } else { diff --git a/src/zh/bainianmanga/build.gradle b/src/zh/bainianmanga/build.gradle index 09fb6af7c..e2bf4483a 100755 --- a/src/zh/bainianmanga/build.gradle +++ b/src/zh/bainianmanga/build.gradle @@ -9,9 +9,4 @@ ext { libVersion = '1.2' } -dependencies { - compileOnly 'com.google.code.gson:gson:2.8.2' - compileOnly 'com.github.salomonbrys.kotson:kotson:2.5.0' -} - apply from: "$rootDir/common.gradle" diff --git a/src/zh/bh3/build.gradle b/src/zh/bh3/build.gradle index a42baf2e4..a8c903f8d 100644 --- a/src/zh/bh3/build.gradle +++ b/src/zh/bh3/build.gradle @@ -9,9 +9,4 @@ ext { libVersion = '1.2' } -dependencies { - compileOnly 'com.google.code.gson:gson:2.8.2' - compileOnly 'com.github.salomonbrys.kotson:kotson:2.5.0' -} - apply from: "$rootDir/common.gradle" diff --git a/src/zh/comico/build.gradle b/src/zh/comico/build.gradle index e4fc99dd6..4bb809bb3 100644 --- a/src/zh/comico/build.gradle +++ b/src/zh/comico/build.gradle @@ -9,9 +9,4 @@ ext { libVersion = '1.2' } -dependencies { - compileOnly 'com.google.code.gson:gson:2.8.2' - compileOnly 'com.github.salomonbrys.kotson:kotson:2.5.0' -} - apply from: "$rootDir/common.gradle" diff --git a/src/zh/kuaikanmanhua/build.gradle b/src/zh/kuaikanmanhua/build.gradle index 3118b5603..18afa0a7b 100644 --- a/src/zh/kuaikanmanhua/build.gradle +++ b/src/zh/kuaikanmanhua/build.gradle @@ -9,9 +9,4 @@ ext { libVersion = '1.2' } -dependencies { - compileOnly 'com.google.code.gson:gson:2.8.2' - compileOnly 'com.github.salomonbrys.kotson:kotson:2.5.0' -} - apply from: "$rootDir/common.gradle" diff --git a/src/zh/manhuagui/build.gradle b/src/zh/manhuagui/build.gradle index 3fddd1b20..20661555b 100644 --- a/src/zh/manhuagui/build.gradle +++ b/src/zh/manhuagui/build.gradle @@ -11,7 +11,6 @@ ext { dependencies { compileOnly project(':duktape-stub') - compileOnly 'com.google.code.gson:gson:2.8.2' } apply from: "$rootDir/common.gradle" diff --git a/src/zh/qimiaomh/build.gradle b/src/zh/qimiaomh/build.gradle index ae12c28ac..6f7d27752 100644 --- a/src/zh/qimiaomh/build.gradle +++ b/src/zh/qimiaomh/build.gradle @@ -9,9 +9,4 @@ ext { libVersion = '1.2' } -dependencies { - compileOnly 'com.google.code.gson:gson:2.8.2' - compileOnly 'com.github.salomonbrys.kotson:kotson:2.5.0' -} - apply from: "$rootDir/common.gradle" diff --git a/src/zh/tohomh123/build.gradle b/src/zh/tohomh123/build.gradle index bca0bc156..53134cad4 100644 --- a/src/zh/tohomh123/build.gradle +++ b/src/zh/tohomh123/build.gradle @@ -9,9 +9,4 @@ ext { libVersion = '1.2' } -dependencies { - compileOnly 'com.google.code.gson:gson:2.8.2' - compileOnly 'com.github.salomonbrys.kotson:kotson:2.5.0' -} - apply from: "$rootDir/common.gradle" diff --git a/src/zh/wuqimanga/build.gradle b/src/zh/wuqimanga/build.gradle index 41de359ce..fa5f468ca 100644 --- a/src/zh/wuqimanga/build.gradle +++ b/src/zh/wuqimanga/build.gradle @@ -11,8 +11,6 @@ ext { dependencies { compileOnly project(':duktape-stub') - compileOnly 'com.google.code.gson:gson:2.8.2' - compileOnly 'com.github.salomonbrys.kotson:kotson:2.5.0' } apply from: "$rootDir/common.gradle"