From b4e171b52ad02247c5611ab067196476cc907183 Mon Sep 17 00:00:00 2001 From: arkon Date: Sat, 8 Aug 2020 19:03:55 -0400 Subject: [PATCH] Remove unused MultiSource annotation Didn't get very far with trying to use an annotation processor to generate metadata at build time. May revisit later. --- annotations/src/main/kotlin/MultiSource.kt | 5 ----- .../tachiyomi/extension/all/boommanga/BoomMangaFactory.kt | 2 -- .../tachiyomi/extension/all/comicake/ComiCakeFactory.kt | 2 -- .../kanade/tachiyomi/extension/all/emerald/EmeraldFactory.kt | 2 -- .../tachiyomi/extension/all/fmreader/FMReaderFactory.kt | 2 -- .../tachiyomi/extension/all/foolslide/FoolSlideFactory.kt | 2 -- .../kanade/tachiyomi/extension/all/genkan/GenkanFactory.kt | 2 -- .../kanade/tachiyomi/extension/all/madara/MadaraFactory.kt | 2 -- .../tachiyomi/extension/all/mangabox/MangaBoxFactory.kt | 2 -- .../extension/all/mmrcms/MyMangaReaderCMSSources.kt | 2 -- .../kanade/tachiyomi/extension/all/paprika/PaprikaFactory.kt | 2 -- .../tachiyomi/extension/all/wpcomics/WPComicsFactory.kt | 2 -- .../extension/all/wpmangastream/WPMangaStreamFactory.kt | 2 -- .../eu/kanade/tachiyomi/extension/all/zbulu/ZbuluFactory.kt | 2 -- .../kanade/tachiyomi/extension/en/mangareader/MRPFactory.kt | 2 -- .../tachiyomi/extension/ja/mangaraw/MangaRawFactory.kt | 2 -- .../extension/pt/mangasproject/MangasProjectFactory.kt | 2 -- 17 files changed, 37 deletions(-) delete mode 100644 annotations/src/main/kotlin/MultiSource.kt diff --git a/annotations/src/main/kotlin/MultiSource.kt b/annotations/src/main/kotlin/MultiSource.kt deleted file mode 100644 index e82273f00..000000000 --- a/annotations/src/main/kotlin/MultiSource.kt +++ /dev/null @@ -1,5 +0,0 @@ -package eu.kanade.tachiyomi.annotations - -@Retention(AnnotationRetention.SOURCE) -@Target(AnnotationTarget.CLASS) -annotation class MultiSource diff --git a/src/all/boommanga/src/eu/kanade/tachiyomi/extension/all/boommanga/BoomMangaFactory.kt b/src/all/boommanga/src/eu/kanade/tachiyomi/extension/all/boommanga/BoomMangaFactory.kt index 9bede020c..3ec73df65 100644 --- a/src/all/boommanga/src/eu/kanade/tachiyomi/extension/all/boommanga/BoomMangaFactory.kt +++ b/src/all/boommanga/src/eu/kanade/tachiyomi/extension/all/boommanga/BoomMangaFactory.kt @@ -1,13 +1,11 @@ package eu.kanade.tachiyomi.extension.all.boommanga -import eu.kanade.tachiyomi.annotations.MultiSource import eu.kanade.tachiyomi.source.Source import eu.kanade.tachiyomi.source.SourceFactory import eu.kanade.tachiyomi.source.model.SManga import org.jsoup.nodes.Document import org.jsoup.nodes.Element -@MultiSource class BoomMangaFactory : SourceFactory { override fun createSources(): List = listOf( BoomMangacom(), diff --git a/src/all/comicake/src/eu/kanade/tachiyomi/extension/all/comicake/ComiCakeFactory.kt b/src/all/comicake/src/eu/kanade/tachiyomi/extension/all/comicake/ComiCakeFactory.kt index 5f685c3b1..34541018e 100644 --- a/src/all/comicake/src/eu/kanade/tachiyomi/extension/all/comicake/ComiCakeFactory.kt +++ b/src/all/comicake/src/eu/kanade/tachiyomi/extension/all/comicake/ComiCakeFactory.kt @@ -1,10 +1,8 @@ package eu.kanade.tachiyomi.extension.all.comicake -import eu.kanade.tachiyomi.annotations.MultiSource import eu.kanade.tachiyomi.source.Source import eu.kanade.tachiyomi.source.SourceFactory -@MultiSource class ComiCakeFactory : SourceFactory { override fun createSources(): List = listOf( LetItGoScans(), diff --git a/src/all/emerald/src/eu/kanade/tachiyomi/extension/all/emerald/EmeraldFactory.kt b/src/all/emerald/src/eu/kanade/tachiyomi/extension/all/emerald/EmeraldFactory.kt index 2042018ac..715998ceb 100644 --- a/src/all/emerald/src/eu/kanade/tachiyomi/extension/all/emerald/EmeraldFactory.kt +++ b/src/all/emerald/src/eu/kanade/tachiyomi/extension/all/emerald/EmeraldFactory.kt @@ -1,10 +1,8 @@ package eu.kanade.tachiyomi.extension.all.emerald -import eu.kanade.tachiyomi.annotations.MultiSource import eu.kanade.tachiyomi.source.Source import eu.kanade.tachiyomi.source.SourceFactory -@MultiSource class EmeraldFactory : SourceFactory { override fun createSources(): List = languages.map { Mangawindow(it.first, it.second) } + languages.map { Batoto(it.first, it.second) } } diff --git a/src/all/fmreader/src/eu/kanade/tachiyomi/extension/all/fmreader/FMReaderFactory.kt b/src/all/fmreader/src/eu/kanade/tachiyomi/extension/all/fmreader/FMReaderFactory.kt index e47e4c1ba..d70eacd93 100644 --- a/src/all/fmreader/src/eu/kanade/tachiyomi/extension/all/fmreader/FMReaderFactory.kt +++ b/src/all/fmreader/src/eu/kanade/tachiyomi/extension/all/fmreader/FMReaderFactory.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.extension.all.fmreader -import eu.kanade.tachiyomi.annotations.MultiSource import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.network.POST import eu.kanade.tachiyomi.network.asObservableSuccess @@ -22,7 +21,6 @@ import org.jsoup.nodes.Document import org.jsoup.nodes.Element import rx.Observable -@MultiSource class FMReaderFactory : SourceFactory { override fun createSources(): List = listOf( LHTranslation(), diff --git a/src/all/foolslide/src/eu/kanade/tachiyomi/extension/all/foolslide/FoolSlideFactory.kt b/src/all/foolslide/src/eu/kanade/tachiyomi/extension/all/foolslide/FoolSlideFactory.kt index 4309af024..6582de7b2 100644 --- a/src/all/foolslide/src/eu/kanade/tachiyomi/extension/all/foolslide/FoolSlideFactory.kt +++ b/src/all/foolslide/src/eu/kanade/tachiyomi/extension/all/foolslide/FoolSlideFactory.kt @@ -7,7 +7,6 @@ import android.support.v7.preference.PreferenceScreen import android.widget.Toast import com.github.salomonbrys.kotson.get import com.google.gson.JsonParser -import eu.kanade.tachiyomi.annotations.MultiSource import eu.kanade.tachiyomi.extension.BuildConfig import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.source.ConfigurableSource @@ -25,7 +24,6 @@ import org.jsoup.nodes.Element import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get -@MultiSource class FoolSlideFactory : SourceFactory { override fun createSources(): List = listOf( JaiminisBox(), diff --git a/src/all/genkan/src/eu/kanade/tachiyomi/extension/all/genkan/GenkanFactory.kt b/src/all/genkan/src/eu/kanade/tachiyomi/extension/all/genkan/GenkanFactory.kt index 73f05da12..d78d478ed 100644 --- a/src/all/genkan/src/eu/kanade/tachiyomi/extension/all/genkan/GenkanFactory.kt +++ b/src/all/genkan/src/eu/kanade/tachiyomi/extension/all/genkan/GenkanFactory.kt @@ -1,10 +1,8 @@ package eu.kanade.tachiyomi.extension.all.genkan -import eu.kanade.tachiyomi.annotations.MultiSource import eu.kanade.tachiyomi.source.Source import eu.kanade.tachiyomi.source.SourceFactory -@MultiSource class GenkanFactory : SourceFactory { override fun createSources(): List = listOf( LeviatanScans(), diff --git a/src/all/madara/src/eu/kanade/tachiyomi/extension/all/madara/MadaraFactory.kt b/src/all/madara/src/eu/kanade/tachiyomi/extension/all/madara/MadaraFactory.kt index 0ac1f098f..dbfccb946 100644 --- a/src/all/madara/src/eu/kanade/tachiyomi/extension/all/madara/MadaraFactory.kt +++ b/src/all/madara/src/eu/kanade/tachiyomi/extension/all/madara/MadaraFactory.kt @@ -1,7 +1,6 @@ package eu.kanade.tachiyomi.extension.all.madara import android.annotation.SuppressLint -import eu.kanade.tachiyomi.annotations.MultiSource import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.network.asObservableSuccess @@ -26,7 +25,6 @@ import org.jsoup.nodes.Document import org.jsoup.nodes.Element import rx.Observable -@MultiSource class MadaraFactory : SourceFactory { override fun createSources(): List = listOf( AdonisFansub(), 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 a7200cf34..c71bc6e89 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 @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.extension.all.mangabox -import eu.kanade.tachiyomi.annotations.MultiSource import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.source.Source import eu.kanade.tachiyomi.source.SourceFactory @@ -15,7 +14,6 @@ import okhttp3.Request import okhttp3.Response import org.jsoup.nodes.Element -@MultiSource class MangaBoxFactory : SourceFactory { override fun createSources(): List = listOf( Mangakakalot(), diff --git a/src/all/mmrcms/src/eu/kanade/tachiyomi/extension/all/mmrcms/MyMangaReaderCMSSources.kt b/src/all/mmrcms/src/eu/kanade/tachiyomi/extension/all/mmrcms/MyMangaReaderCMSSources.kt index 5919942f6..6ff654ed4 100644 --- a/src/all/mmrcms/src/eu/kanade/tachiyomi/extension/all/mmrcms/MyMangaReaderCMSSources.kt +++ b/src/all/mmrcms/src/eu/kanade/tachiyomi/extension/all/mmrcms/MyMangaReaderCMSSources.kt @@ -6,10 +6,8 @@ import com.github.salomonbrys.kotson.string import com.google.gson.JsonArray import com.google.gson.JsonObject import com.google.gson.JsonParser -import eu.kanade.tachiyomi.annotations.MultiSource import eu.kanade.tachiyomi.source.SourceFactory -@MultiSource class MyMangaReaderCMSSources : SourceFactory { /** * Create a new copy of the sources diff --git a/src/all/paprika/src/eu/kanade/tachiyomi/extension/all/paprika/PaprikaFactory.kt b/src/all/paprika/src/eu/kanade/tachiyomi/extension/all/paprika/PaprikaFactory.kt index 642befa47..72e6fb99d 100644 --- a/src/all/paprika/src/eu/kanade/tachiyomi/extension/all/paprika/PaprikaFactory.kt +++ b/src/all/paprika/src/eu/kanade/tachiyomi/extension/all/paprika/PaprikaFactory.kt @@ -1,10 +1,8 @@ package eu.kanade.tachiyomi.extension.all.paprika -import eu.kanade.tachiyomi.annotations.MultiSource import eu.kanade.tachiyomi.source.Source import eu.kanade.tachiyomi.source.SourceFactory -@MultiSource class PaprikaFactory : SourceFactory { override fun createSources(): List = listOf( MangazukiXyz(), diff --git a/src/all/wpcomics/src/eu/kanade/tachiyomi/extension/all/wpcomics/WPComicsFactory.kt b/src/all/wpcomics/src/eu/kanade/tachiyomi/extension/all/wpcomics/WPComicsFactory.kt index a4722fcb9..4a7304905 100644 --- a/src/all/wpcomics/src/eu/kanade/tachiyomi/extension/all/wpcomics/WPComicsFactory.kt +++ b/src/all/wpcomics/src/eu/kanade/tachiyomi/extension/all/wpcomics/WPComicsFactory.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.extension.all.wpcomics -import eu.kanade.tachiyomi.annotations.MultiSource import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.source.Source import eu.kanade.tachiyomi.source.SourceFactory @@ -17,7 +16,6 @@ import okhttp3.Response import org.jsoup.nodes.Document import org.jsoup.nodes.Element -@MultiSource class WPComicsFactory : SourceFactory { override fun createSources(): List = listOf( ManhuaES(), diff --git a/src/all/wpmangastream/src/eu/kanade/tachiyomi/extension/all/wpmangastream/WPMangaStreamFactory.kt b/src/all/wpmangastream/src/eu/kanade/tachiyomi/extension/all/wpmangastream/WPMangaStreamFactory.kt index 965ba4233..a4cd53263 100644 --- a/src/all/wpmangastream/src/eu/kanade/tachiyomi/extension/all/wpmangastream/WPMangaStreamFactory.kt +++ b/src/all/wpmangastream/src/eu/kanade/tachiyomi/extension/all/wpmangastream/WPMangaStreamFactory.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.extension.all.wpmangastream -import eu.kanade.tachiyomi.annotations.MultiSource import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.network.asObservableSuccess import eu.kanade.tachiyomi.source.Source @@ -22,7 +21,6 @@ import org.jsoup.nodes.Document import org.jsoup.nodes.Element import rx.Observable -@MultiSource class WPMangaStreamFactory : SourceFactory { override fun createSources(): List = listOf( Kiryuu(), diff --git a/src/all/zbulu/src/eu/kanade/tachiyomi/extension/all/zbulu/ZbuluFactory.kt b/src/all/zbulu/src/eu/kanade/tachiyomi/extension/all/zbulu/ZbuluFactory.kt index 08dd51f71..c34517e4f 100644 --- a/src/all/zbulu/src/eu/kanade/tachiyomi/extension/all/zbulu/ZbuluFactory.kt +++ b/src/all/zbulu/src/eu/kanade/tachiyomi/extension/all/zbulu/ZbuluFactory.kt @@ -1,10 +1,8 @@ package eu.kanade.tachiyomi.extension.all.zbulu -import eu.kanade.tachiyomi.annotations.MultiSource import eu.kanade.tachiyomi.source.Source import eu.kanade.tachiyomi.source.SourceFactory -@MultiSource class ZbuluFactory : SourceFactory { override fun createSources(): List = listOf( HolyManga(), diff --git a/src/en/mangareader/src/eu/kanade/tachiyomi/extension/en/mangareader/MRPFactory.kt b/src/en/mangareader/src/eu/kanade/tachiyomi/extension/en/mangareader/MRPFactory.kt index 5402044a9..9b02685d9 100644 --- a/src/en/mangareader/src/eu/kanade/tachiyomi/extension/en/mangareader/MRPFactory.kt +++ b/src/en/mangareader/src/eu/kanade/tachiyomi/extension/en/mangareader/MRPFactory.kt @@ -1,10 +1,8 @@ package eu.kanade.tachiyomi.extension.en.mangareader -import eu.kanade.tachiyomi.annotations.MultiSource import eu.kanade.tachiyomi.source.Source import eu.kanade.tachiyomi.source.SourceFactory -@MultiSource class MRPFactory : SourceFactory { override fun createSources(): List = listOf( Mangareader(), 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 0bdd4e165..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 @@ -1,10 +1,8 @@ package eu.kanade.tachiyomi.extension.ja.mangaraw -import eu.kanade.tachiyomi.annotations.MultiSource import eu.kanade.tachiyomi.source.Source import eu.kanade.tachiyomi.source.SourceFactory -@MultiSource class MangaRawFactory : SourceFactory { override fun createSources(): List = listOf( Manga1000(), diff --git a/src/pt/mangasproject/src/eu/kanade/tachiyomi/extension/pt/mangasproject/MangasProjectFactory.kt b/src/pt/mangasproject/src/eu/kanade/tachiyomi/extension/pt/mangasproject/MangasProjectFactory.kt index b31f3db01..846b83df3 100644 --- a/src/pt/mangasproject/src/eu/kanade/tachiyomi/extension/pt/mangasproject/MangasProjectFactory.kt +++ b/src/pt/mangasproject/src/eu/kanade/tachiyomi/extension/pt/mangasproject/MangasProjectFactory.kt @@ -1,10 +1,8 @@ package eu.kanade.tachiyomi.extension.pt.mangasproject -import eu.kanade.tachiyomi.annotations.MultiSource import eu.kanade.tachiyomi.source.Source import eu.kanade.tachiyomi.source.SourceFactory -@MultiSource class MangasProjectFactory : SourceFactory { override fun createSources(): List = listOf( LeitorNet(),