diff --git a/app/build.gradle b/app/build.gradle index fe533017..6eee3400 100644 --- a/app/build.gradle +++ b/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 - targetSdk 28 - buildConfigField("String", "CLIENT_ID", "\"${clientId}\"") + minSdk 16 + targetSdk 34 } 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' diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 4e9d28ac..033b570f 100644 --- a/app/proguard-rules.pro +++ b/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 ; } --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.** { *; } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 34e4ff12..d68fdf9b 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,7 +1,6 @@ + xmlns:tools="http://schemas.android.com/tools"> diff --git a/app/src/main/java/com/github/catvod/api/AliYun.java b/app/src/main/java/com/github/catvod/api/AliYun.java index 829c13a0..18b26586 100644 --- a/app/src/main/java/com/github/catvod/api/AliYun.java +++ b/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()); } diff --git a/build.gradle b/build.gradle index 0fd13f1f..4f8a5bab 100644 --- a/build.gradle +++ b/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.library' version '7.2.2' apply false + id 'com.android.application' version '8.5.0' apply false + id 'com.android.library' version '8.5.0' apply false } tasks.register('clean', Delete) { - delete rootProject.buildDir + delete rootProject.layout.buildDirectory } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 7ace3705..4e59a36c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -19,5 +19,4 @@ android.enableJetifier=true # Enables namespacing of each library's R class so that its R class includes only the # 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 \ No newline at end of file +android.nonTransitiveRClass=true \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index cbb33c1d..c39648e1 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/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 diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index 1ed20817..c2ea0312 100644 Binary files a/jar/custom_spider.jar and b/jar/custom_spider.jar differ diff --git a/jar/custom_spider.jar.md5 b/jar/custom_spider.jar.md5 index d5911608..e40141dc 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -72e81d4bc7b9066aeb031998746f0e52 +7751ab5675370251ec75b701aafa6f1c