parent
4b155000b4
commit
205e138dd2
|
@ -37,7 +37,7 @@ jobs:
|
||||||
- name: Set up JDK
|
- name: Set up JDK
|
||||||
uses: actions/setup-java@v3
|
uses: actions/setup-java@v3
|
||||||
with:
|
with:
|
||||||
java-version: 11
|
java-version: 17
|
||||||
distribution: adopt
|
distribution: adopt
|
||||||
|
|
||||||
- name: Prepare signing key
|
- name: Prepare signing key
|
||||||
|
@ -82,7 +82,7 @@ jobs:
|
||||||
- name: Set up JDK
|
- name: Set up JDK
|
||||||
uses: actions/setup-java@v3
|
uses: actions/setup-java@v3
|
||||||
with:
|
with:
|
||||||
java-version: 11
|
java-version: 17
|
||||||
distribution: adopt
|
distribution: adopt
|
||||||
|
|
||||||
- name: Prepare signing key
|
- name: Prepare signing key
|
||||||
|
|
|
@ -71,6 +71,7 @@ android {
|
||||||
renderScript false
|
renderScript false
|
||||||
resValues false
|
resValues false
|
||||||
shaders false
|
shaders false
|
||||||
|
buildConfig true
|
||||||
}
|
}
|
||||||
|
|
||||||
compileOptions {
|
compileOptions {
|
||||||
|
|
|
@ -21,3 +21,5 @@ org.gradle.caching=true
|
||||||
|
|
||||||
# Enable AndroidX dependencies
|
# Enable AndroidX dependencies
|
||||||
android.useAndroidX=true
|
android.useAndroidX=true
|
||||||
|
android.nonTransitiveRClass=false
|
||||||
|
android.nonFinalResIds=false
|
||||||
|
|
|
@ -4,7 +4,7 @@ coroutines_version = "1.6.4"
|
||||||
serialization_version = "1.4.0"
|
serialization_version = "1.4.0"
|
||||||
|
|
||||||
[libraries]
|
[libraries]
|
||||||
gradle-agp = { module = "com.android.tools.build:gradle", version = "7.4.2" }
|
gradle-agp = { module = "com.android.tools.build:gradle", version = "8.2.1" }
|
||||||
gradle-kotlin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin_version" }
|
gradle-kotlin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin_version" }
|
||||||
gradle-serialization = { module = "org.jetbrains.kotlin:kotlin-serialization", version.ref = "kotlin_version" }
|
gradle-serialization = { module = "org.jetbrains.kotlin:kotlin-serialization", version.ref = "kotlin_version" }
|
||||||
gradle-kotlinter = { module = "org.jmailen.gradle:kotlinter-gradle", version = "3.13.0" }
|
gradle-kotlinter = { module = "org.jmailen.gradle:kotlinter-gradle", version = "3.13.0" }
|
||||||
|
|
|
@ -3,7 +3,6 @@ package eu.kanade.tachiyomi.extension.all.mangadex
|
||||||
import android.content.SharedPreferences
|
import android.content.SharedPreferences
|
||||||
import okhttp3.Interceptor
|
import okhttp3.Interceptor
|
||||||
import okhttp3.Response
|
import okhttp3.Response
|
||||||
import java.io.IOException
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Interceptor to set custom useragent for MangaDex
|
* Interceptor to set custom useragent for MangaDex
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
package eu.kanade.tachiyomi.extension.en.collectedcurios
|
package eu.kanade.tachiyomi.extension.en.collectedcurios
|
||||||
|
|
||||||
import android.util.Log
|
|
||||||
import eu.kanade.tachiyomi.source.model.FilterList
|
import eu.kanade.tachiyomi.source.model.FilterList
|
||||||
import eu.kanade.tachiyomi.source.model.MangasPage
|
import eu.kanade.tachiyomi.source.model.MangasPage
|
||||||
import eu.kanade.tachiyomi.source.model.Page
|
import eu.kanade.tachiyomi.source.model.Page
|
||||||
|
|
|
@ -97,12 +97,16 @@ class MangaClub : ParsedHttpSource() {
|
||||||
title = document.select("div.info strong").text().replace("\\'", "'").substringBefore("/").trim()
|
title = document.select("div.info strong").text().replace("\\'", "'").substringBefore("/").trim()
|
||||||
author = document.select("div.info a[href*=author]").joinToString(", ") { it.text().trim() }
|
author = document.select("div.info a[href*=author]").joinToString(", ") { it.text().trim() }
|
||||||
artist = author
|
artist = author
|
||||||
status = if (document.select("div.fullstory").text().contains("Данное произведение лицензировано на территории РФ. Главы удалены.")) SManga.LICENSED else when (document.select("div.info a[href*=status_translation]").text().trim()) {
|
status = if (document.select("div.fullstory").text().contains("Данное произведение лицензировано на территории РФ. Главы удалены.")) {
|
||||||
|
SManga.LICENSED
|
||||||
|
} else {
|
||||||
|
when (document.select("div.info a[href*=status_translation]").text().trim()) {
|
||||||
"Продолжается" -> SManga.ONGOING
|
"Продолжается" -> SManga.ONGOING
|
||||||
"Завершен" -> SManga.COMPLETED
|
"Завершен" -> SManga.COMPLETED
|
||||||
"Заморожено/Заброшено" -> SManga.ON_HIATUS
|
"Заморожено/Заброшено" -> SManga.ON_HIATUS
|
||||||
else -> SManga.UNKNOWN
|
else -> SManga.UNKNOWN
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
description = document.select(".description").first()!!.text()
|
description = document.select(".description").first()!!.text()
|
||||||
genre = document.select("div.info a[href*=tags]").joinToString(", ") {
|
genre = document.select("div.info a[href*=tags]").joinToString(", ") {
|
||||||
|
|
|
@ -12,7 +12,6 @@ import eu.kanade.tachiyomi.source.model.SManga
|
||||||
import eu.kanade.tachiyomi.source.online.ParsedHttpSource
|
import eu.kanade.tachiyomi.source.online.ParsedHttpSource
|
||||||
import eu.kanade.tachiyomi.util.asJsoup
|
import eu.kanade.tachiyomi.util.asJsoup
|
||||||
import okhttp3.Headers
|
import okhttp3.Headers
|
||||||
import okhttp3.HttpUrl.Companion.toHttpUrl
|
|
||||||
import okhttp3.OkHttpClient
|
import okhttp3.OkHttpClient
|
||||||
import okhttp3.Request
|
import okhttp3.Request
|
||||||
import okhttp3.Response
|
import okhttp3.Response
|
||||||
|
|
|
@ -30,7 +30,6 @@ import org.json.JSONObject
|
||||||
import uy.kohesive.injekt.Injekt
|
import uy.kohesive.injekt.Injekt
|
||||||
import uy.kohesive.injekt.api.get
|
import uy.kohesive.injekt.api.get
|
||||||
import java.net.URLEncoder
|
import java.net.URLEncoder
|
||||||
import java.nio.charset.Charset
|
|
||||||
import java.text.SimpleDateFormat
|
import java.text.SimpleDateFormat
|
||||||
import java.util.Date
|
import java.util.Date
|
||||||
import java.util.Locale
|
import java.util.Locale
|
||||||
|
|
Loading…
Reference in New Issue