Update gradle

app/build.gradle

@@ -4,13 +4,14 @@ plugins {
 }
 
 android {
-    compileSdk 33
+    namespace 'com.github.catvod'
+
+    compileSdk 34
 
     defaultConfig {
         applicationId "com.github.catvod.demo"
-        minSdk 17
+        minSdk 16
-        targetSdk 28
+        targetSdk 34
-        buildConfigField("String", "CLIENT_ID", "\"${clientId}\"")
     }
 
     buildTypes {
@@ -43,7 +44,7 @@ dependencies {
     implementation 'com.github.thegrizzlylabs:sardine-android:0.9'
     implementation 'wang.harlon.quickjs:wrapper-android:0.21.1'
     implementation 'com.squareup.okhttp3:okhttp:3.12.13'
-    implementation 'com.google.code.gson:gson:2.8.6'
+    implementation 'com.google.code.gson:gson:2.11.0'
     implementation 'cn.wanghaomiao:JsoupXpath:2.5.1'
     implementation 'org.nanohttpd:nanohttpd:2.3.1'
     implementation 'com.google.zxing:core:3.3.0'

app/proguard-rules.pro

@@ -12,17 +12,7 @@
 -keep class androidx.core.** { *; }
 
 # Gson
--keepattributes Signature
--keepattributes *Annotation*
--dontwarn sun.misc.**
 -keep class com.google.gson.** { *; }
--keep class * extends com.google.gson.TypeAdapter
--keep class * implements com.google.gson.TypeAdapterFactory
--keep class * implements com.google.gson.JsonSerializer
--keep class * implements com.google.gson.JsonDeserializer
--keepclassmembers,allowobfuscation class * { @com.google.gson.annotations.SerializedName <fields>; }
--keep,allowobfuscation,allowshrinking class com.google.gson.reflect.TypeToken
--keep,allowobfuscation,allowshrinking class * extends com.google.gson.reflect.TypeToken
 
 # Nano
 -keep class fi.iki.elonen.** { *; }
@@ -42,6 +32,8 @@
 -keep class com.thegrizzlylabs.sardineandroid.** { *; }
 
 # Smbj
+-dontwarn org.xmlpull.v1.**
+-dontwarn android.content.res.**
 -keep class com.hierynomus.** { *; }
 -keep class net.engio.mbassy.** { *; }
 

app/src/main/AndroidManifest.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:tools="http://schemas.android.com/tools">
-    package="com.github.catvod">
 
     <uses-sdk tools:overrideLibrary="com.whl.quickjs.android" />
 

app/src/main/java/com/github/catvod/api/AliYun.java

@@ -14,7 +14,6 @@ import android.widget.EditText;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 
-import com.github.catvod.BuildConfig;
 import com.github.catvod.bean.Result;
 import com.github.catvod.bean.Sub;
 import com.github.catvod.bean.Vod;
@@ -219,7 +218,7 @@ public class AliYun {
         JsonObject param = new JsonObject();
         param.addProperty("authorize", 1);
         param.addProperty("scope", "user:base,file:all:read,file:all:write");
-        String url = "https://open.aliyundrive.com/oauth/users/authorize?client_id=" + BuildConfig.CLIENT_ID + "&redirect_uri=https://alist.nn.ci/tool/aliyundrive/callback&scope=user:base,file:all:read,file:all:write&state=";
+        String url = "https://open.aliyundrive.com/oauth/users/authorize?client_id=76917ccccd4441c39457a04f6084fb2f&redirect_uri=https://alist.nn.ci/tool/aliyundrive/callback&scope=user:base,file:all:read,file:all:write&state=";
         String json = auth(url, param.toString(), true);
         return oauthRedirect(Code.objectFrom(json).getCode());
     }

build.gradle

@@ -1,10 +1,10 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
     id 'ru.cleverpumpkin.proguard-dictionaries-generator' version '1.0.8' apply false
-    id 'com.android.application' version '7.2.2' apply false
+    id 'com.android.application' version '8.5.0' apply false
-    id 'com.android.library' version '7.2.2' apply false
+    id 'com.android.library' version '8.5.0' apply false
 }
 
 tasks.register('clean', Delete) {
-    delete rootProject.buildDir
+    delete rootProject.layout.buildDirectory
 }

gradle.properties

@@ -20,4 +20,3 @@ android.enableJetifier=true
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
 android.nonTransitiveRClass=true
-clientId=76917ccccd4441c39457a04f6084fb2f

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Wed Mar 29 12:54:35 CST 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

jar/custom_spider.jar.md5

@@ -1 +1 @@
-72e81d4bc7b9066aeb031998746f0e52
+7751ab5675370251ec75b701aafa6f1c