upgrade AGP to 8.2.1 (#255)

* upgrade AGP * bump to java 17 in ci
2024-11-24 11:22:37 +01:00 · 2024-01-15 01:04:00 +05:00 · 2024-01-15 01:04:00 +05:00 · f3a1b3e444
commit f3a1b3e444
parent f1fd68b3dc
12 changed files with 23 additions and 20 deletions
--- a/.github/workflows/build_pull_request.yml
+++ b/.github/workflows/build_pull_request.yml
@ -34,7 +34,7 @@ jobs:
      - name: Set up JDK
        uses: actions/setup-java@v4
        with:
-          java-version: 11
+          java-version: 17
          distribution: adopt

      - id: get-changed-files
@ -110,7 +110,7 @@ jobs:
      - name: Set up JDK
        uses: actions/setup-java@v4
        with:
-          java-version: 11
+          java-version: 17
          distribution: adopt

      - name: Generate sources from the multi-source library
@ -144,7 +144,7 @@ jobs:
      - name: Set up JDK
        uses: actions/setup-java@v4
        with:
-          java-version: 11
+          java-version: 17
          distribution: adopt

      - name: Build extensions (chunk ${{ matrix.chunk }})
--- a/.github/workflows/build_push.yml
+++ b/.github/workflows/build_push.yml
@ -34,7 +34,7 @@ jobs:
      - name: Set up JDK
        uses: actions/setup-java@v4
        with:
-          java-version: 11
+          java-version: 17
          distribution: adopt

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

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

      - name: Prepare signing key
--- a/common.gradle
+++ b/common.gradle
@ -71,6 +71,7 @@ android {
        renderScript false
        resValues false
        shaders false
+        buildConfig true
    }

    compileOptions {
--- a/gradle.properties
+++ b/gradle.properties
@ -21,3 +21,5 @@ org.gradle.caching=true

 # Enable AndroidX dependencies
 android.useAndroidX=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@ -4,7 +4,7 @@ coroutines_version = "1.6.4"
 serialization_version = "1.4.0"

 [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-serialization = { module = "org.jetbrains.kotlin:kotlin-serialization", version.ref = "kotlin_version" }
 gradle-kotlinter = { module = "org.jmailen.gradle:kotlinter-gradle", version = "3.13.0" }
--- a/src/all/comicfury/src/eu/kanade/tachiyomi/extension/all/comicfury/ComicFury.kt
+++ b/src/all/comicfury/src/eu/kanade/tachiyomi/extension/all/comicfury/ComicFury.kt
@ -31,7 +31,7 @@ class ComicFury(
    private val extraName: String = "",
 ) : HttpSource(), ConfigurableSource {
    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
    private val dateFormat = SimpleDateFormat("dd MMM yyyy hh:mm aa", Locale.US)
    private val dateFormatSlim = SimpleDateFormat("dd MMM yyyy", Locale.US)
--- a/src/all/mangadex/src/eu/kanade/tachiyomi/extension/all/mangadex/MdUserAgentInterceptor.kt
+++ b/src/all/mangadex/src/eu/kanade/tachiyomi/extension/all/mangadex/MdUserAgentInterceptor.kt
@ -3,7 +3,6 @@ package eu.kanade.tachiyomi.extension.all.mangadex
 import android.content.SharedPreferences
 import okhttp3.Interceptor
 import okhttp3.Response
-import java.io.IOException

 /**
 * Interceptor to set custom useragent for MangaDex
--- a/src/en/collectedcurios/src/eu/kanade/tachiyomi/extension/en/collectedcurios/Collectedcurios.kt
+++ b/src/en/collectedcurios/src/eu/kanade/tachiyomi/extension/en/collectedcurios/Collectedcurios.kt
@ -1,6 +1,5 @@
 package eu.kanade.tachiyomi.extension.en.collectedcurios

-import android.util.Log
 import eu.kanade.tachiyomi.source.model.FilterList
 import eu.kanade.tachiyomi.source.model.MangasPage
 import eu.kanade.tachiyomi.source.model.Page
@ -58,7 +57,7 @@ class Collectedcurios : ParsedHttpSource() {
                        description = "Spider and Scorpion webcomic."
                        thumbnail_url = "https://www.collectedcurios.com/images/CC_2011_Spider_And_Scorpion_Button.jpg"
                    },
-                    */
+                     */
                ),
                false,
            ),
@ -113,7 +112,7 @@ class Collectedcurios : ParsedHttpSource() {
    override fun imageUrlParse(response: Response): String {
        val url = response.request.url.toString()
        val document = response.asJsoup()
-        
+
        return when {
            url.contains("sequentialart") ->
                document.selectFirst(".w3-image")!!.absUrl("src")
--- a/src/ja/twi4/src/eu/kanade/tachiyomi/extension/ja/twi4/Twi4.kt
+++ b/src/ja/twi4/src/eu/kanade/tachiyomi/extension/ja/twi4/Twi4.kt
@ -68,7 +68,7 @@ class Twi4 : HttpSource() {
                        author = manga.select("div.hgroup > p").text()
                        status =
                            if (manga.select("ul:first-child > li:last-child > em.is-completed")
-                                    .isEmpty()
+                                .isEmpty()
                            ) {
                                SManga.ONGOING
                            } else {
--- a/src/ru/mangaclub/src/eu/kanade/tachiyomi/extension/ru/mangaclub/MangaClub.kt
+++ b/src/ru/mangaclub/src/eu/kanade/tachiyomi/extension/ru/mangaclub/MangaClub.kt
@ -97,11 +97,15 @@ class MangaClub : ParsedHttpSource() {
        title = document.select("div.info strong").text().replace("\\'", "'").substringBefore("/").trim()
        author = document.select("div.info a[href*=author]").joinToString(", ") { it.text().trim() }
        artist = author
-        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.COMPLETED
-            "Заморожено/Заброшено" -> SManga.ON_HIATUS
-            else -> SManga.UNKNOWN
+        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.COMPLETED
+                "Заморожено/Заброшено" -> SManga.ON_HIATUS
+                else -> SManga.UNKNOWN
+            }
        }

        description = document.select(".description").first()!!.text()
--- a/src/ru/unicomics/src/eu/kanade/tachiyomi/extension/ru/unicomics/UniComics.kt
+++ b/src/ru/unicomics/src/eu/kanade/tachiyomi/extension/ru/unicomics/UniComics.kt
@ -12,7 +12,6 @@ import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
 import eu.kanade.tachiyomi.util.asJsoup
 import okhttp3.Headers
-import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
--- a/src/zh/picacomic/src/eu/kanade/tachiyomi/extension/zh/picacomic/Picacomic.kt
+++ b/src/zh/picacomic/src/eu/kanade/tachiyomi/extension/zh/picacomic/Picacomic.kt
@ -30,7 +30,6 @@ import org.json.JSONObject
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import java.net.URLEncoder
-import java.nio.charset.Charset
 import java.text.SimpleDateFormat
 import java.util.Date
 import java.util.Locale