diff --git a/common.gradle b/common.gradle index f8235f6f9..17895d72f 100644 --- a/common.gradle +++ b/common.gradle @@ -23,7 +23,7 @@ android { targetSdkVersion AndroidConfig.targetSdk applicationIdSuffix pkgNameSuffix versionCode extVersionCode - versionName project.ext.properties.getOrDefault("libVersion", "13") + ".$extVersionCode" + versionName project.ext.properties.getOrDefault("libVersion", "14") + ".$extVersionCode" base { archivesName = "aniyomi-$pkgNameSuffix-v$versionName" } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 9840a2be9..c825b2d0d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,7 +5,7 @@ kotlin_version = "1.8.22" serialization_version = "1.5.1" [libraries] -aniyomi-lib = { module = "com.github.jmir1:extensions-lib", version = "a2f1874" } +aniyomi-lib = { module = "com.github.aniyomiorg:extensions-lib", version = "14" } kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin_version" } kotlin-protobuf = { module = "org.jetbrains.kotlinx:kotlinx-serialization-protobuf", version.ref = "serialization_version" } diff --git a/src/all/kamyroll/src/eu/kanade/tachiyomi/animeextension/all/kamyroll/Yomiroll.kt b/src/all/kamyroll/src/eu/kanade/tachiyomi/animeextension/all/kamyroll/Yomiroll.kt index 0d538647e..2d48c86ed 100644 --- a/src/all/kamyroll/src/eu/kanade/tachiyomi/animeextension/all/kamyroll/Yomiroll.kt +++ b/src/all/kamyroll/src/eu/kanade/tachiyomi/animeextension/all/kamyroll/Yomiroll.kt @@ -419,8 +419,9 @@ class Yomiroll : ConfigurableAnimeSource, AnimeHttpSource() { ?.joinToString { gen -> gen.replaceFirstChar { it.uppercase() } } status = anime?.let { val media = json.decodeFromString(anime.url) - if (media.media_type == "series") fetchStatusByTitle(this@toSAnime.title) - else SAnime.COMPLETED + if (media.media_type == "series") { + fetchStatusByTitle(this@toSAnime.title) + } else SAnime.COMPLETED } ?: SAnime.UNKNOWN author = content_provider description = anime?.description ?: StringBuilder().apply { diff --git a/src/ar/tuktukcinema/src/eu/kanade/tachiyomi/animeextension/ar/tuktukcinema/Tuktukcinema.kt b/src/ar/tuktukcinema/src/eu/kanade/tachiyomi/animeextension/ar/tuktukcinema/Tuktukcinema.kt index a4ed9bae2..41bd49442 100644 --- a/src/ar/tuktukcinema/src/eu/kanade/tachiyomi/animeextension/ar/tuktukcinema/Tuktukcinema.kt +++ b/src/ar/tuktukcinema/src/eu/kanade/tachiyomi/animeextension/ar/tuktukcinema/Tuktukcinema.kt @@ -6,6 +6,7 @@ import android.widget.Toast import androidx.preference.EditTextPreference import androidx.preference.ListPreference import androidx.preference.PreferenceScreen +import dev.datlag.jsunpacker.JsUnpacker import eu.kanade.tachiyomi.animeextension.BuildConfig import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource import eu.kanade.tachiyomi.animesource.model.AnimeFilter @@ -16,11 +17,10 @@ import eu.kanade.tachiyomi.animesource.model.Video import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource import eu.kanade.tachiyomi.lib.doodextractor.DoodExtractor import eu.kanade.tachiyomi.lib.okruextractor.OkruExtractor +import eu.kanade.tachiyomi.lib.playlistutils.PlaylistUtils import eu.kanade.tachiyomi.lib.streamtapeextractor.StreamTapeExtractor import eu.kanade.tachiyomi.lib.uqloadextractor.UqloadExtractor import eu.kanade.tachiyomi.lib.vidbomextractor.VidBomExtractor -import eu.kanade.tachiyomi.lib.playlistutils.PlaylistUtils -import dev.datlag.jsunpacker.JsUnpacker import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.util.asJsoup import kotlinx.coroutines.Dispatchers @@ -162,7 +162,7 @@ class Tuktukcinema : ConfigurableAnimeSource, ParsedAnimeHttpSource() { val url = element.attr("data-link") val txt = element.text() return when { - "Main" in txt -> { + "Main" in txt -> { videosFromMain(url) } url.contains("ok") -> { @@ -208,7 +208,7 @@ class Tuktukcinema : ConfigurableAnimeSource, ParsedAnimeHttpSource() { private fun videosFromOthers(url: String, prefix: String): List