upgrade AGP to 8.2.1 (#255)

* upgrade AGP

* bump to java 17 in ci
This commit is contained in:
AwkwardPeak7 2024-01-15 01:04:00 +05:00 committed by GitHub
parent f1fd68b3dc
commit f3a1b3e444
12 changed files with 23 additions and 20 deletions

View File

@ -34,7 +34,7 @@ jobs:
- name: Set up JDK - name: Set up JDK
uses: actions/setup-java@v4 uses: actions/setup-java@v4
with: with:
java-version: 11 java-version: 17
distribution: adopt distribution: adopt
- id: get-changed-files - id: get-changed-files
@ -110,7 +110,7 @@ jobs:
- name: Set up JDK - name: Set up JDK
uses: actions/setup-java@v4 uses: actions/setup-java@v4
with: with:
java-version: 11 java-version: 17
distribution: adopt distribution: adopt
- name: Generate sources from the multi-source library - name: Generate sources from the multi-source library
@ -144,7 +144,7 @@ jobs:
- name: Set up JDK - name: Set up JDK
uses: actions/setup-java@v4 uses: actions/setup-java@v4
with: with:
java-version: 11 java-version: 17
distribution: adopt distribution: adopt
- name: Build extensions (chunk ${{ matrix.chunk }}) - name: Build extensions (chunk ${{ matrix.chunk }})

View File

@ -34,7 +34,7 @@ jobs:
- name: Set up JDK - name: Set up JDK
uses: actions/setup-java@v4 uses: actions/setup-java@v4
with: with:
java-version: 11 java-version: 17
distribution: adopt distribution: adopt
- name: Generate multisrc sources - name: Generate multisrc sources
@ -81,7 +81,7 @@ jobs:
- name: Set up JDK - name: Set up JDK
uses: actions/setup-java@v4 uses: actions/setup-java@v4
with: with:
java-version: 11 java-version: 17
distribution: adopt distribution: adopt
- name: Prepare signing key - name: Prepare signing key
@ -130,7 +130,7 @@ jobs:
- name: Set up JDK - name: Set up JDK
uses: actions/setup-java@v4 uses: actions/setup-java@v4
with: with:
java-version: 11 java-version: 17
distribution: adopt distribution: adopt
- name: Prepare signing key - name: Prepare signing key

View File

@ -71,6 +71,7 @@ android {
renderScript false renderScript false
resValues false resValues false
shaders false shaders false
buildConfig true
} }
compileOptions { compileOptions {

View File

@ -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

View File

@ -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" }

View File

@ -31,7 +31,7 @@ class ComicFury(
private val extraName: String = "", private val extraName: String = "",
) : HttpSource(), ConfigurableSource { ) : HttpSource(), ConfigurableSource {
override val baseUrl: String = "https://comicfury.com" override val baseUrl: String = "https://comicfury.com"
override val name: String = "Comic Fury$extraName" //Used for No Text override val name: String = "Comic Fury$extraName" // Used for No Text
override val supportsLatest: Boolean = true override val supportsLatest: Boolean = true
private val dateFormat = SimpleDateFormat("dd MMM yyyy hh:mm aa", Locale.US) private val dateFormat = SimpleDateFormat("dd MMM yyyy hh:mm aa", Locale.US)
private val dateFormatSlim = SimpleDateFormat("dd MMM yyyy", Locale.US) private val dateFormatSlim = SimpleDateFormat("dd MMM yyyy", Locale.US)

View File

@ -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

View File

@ -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
@ -58,7 +57,7 @@ class Collectedcurios : ParsedHttpSource() {
description = "Spider and Scorpion webcomic." description = "Spider and Scorpion webcomic."
thumbnail_url = "https://www.collectedcurios.com/images/CC_2011_Spider_And_Scorpion_Button.jpg" thumbnail_url = "https://www.collectedcurios.com/images/CC_2011_Spider_And_Scorpion_Button.jpg"
}, },
*/ */
), ),
false, false,
), ),
@ -113,7 +112,7 @@ class Collectedcurios : ParsedHttpSource() {
override fun imageUrlParse(response: Response): String { override fun imageUrlParse(response: Response): String {
val url = response.request.url.toString() val url = response.request.url.toString()
val document = response.asJsoup() val document = response.asJsoup()
return when { return when {
url.contains("sequentialart") -> url.contains("sequentialart") ->
document.selectFirst(".w3-image")!!.absUrl("src") document.selectFirst(".w3-image")!!.absUrl("src")

View File

@ -68,7 +68,7 @@ class Twi4 : HttpSource() {
author = manga.select("div.hgroup > p").text() author = manga.select("div.hgroup > p").text()
status = status =
if (manga.select("ul:first-child > li:last-child > em.is-completed") if (manga.select("ul:first-child > li:last-child > em.is-completed")
.isEmpty() .isEmpty()
) { ) {
SManga.ONGOING SManga.ONGOING
} else { } else {

View File

@ -97,11 +97,15 @@ 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.ONGOING SManga.LICENSED
"Завершен" -> SManga.COMPLETED } else {
"Заморожено/Заброшено" -> SManga.ON_HIATUS when (document.select("div.info a[href*=status_translation]").text().trim()) {
else -> SManga.UNKNOWN "Продолжается" -> SManga.ONGOING
"Завершен" -> SManga.COMPLETED
"Заморожено/Заброшено" -> SManga.ON_HIATUS
else -> SManga.UNKNOWN
}
} }
description = document.select(".description").first()!!.text() description = document.select(".description").first()!!.text()

View File

@ -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

View File

@ -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