From 1d3cf54005c984767f9da9159a28075f294ba0ea Mon Sep 17 00:00:00 2001 From: jhengazuki Date: Tue, 21 Oct 2025 03:50:44 +0800 Subject: [PATCH] Update okhttp --- app/proguard-rules.pro | 14 ++------------ build.gradle | 2 +- catvod/build.gradle | 4 +--- 3 files changed, 4 insertions(+), 16 deletions(-) diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index f46105641..20bd369c0 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -38,10 +38,6 @@ -keep class org.fourthline.cling.** { *; } -keep class javax.xml.** { *; } -# Cronet --keep class org.chromium.net.** { *; } --keep class com.google.net.cronet.** { *; } - # EXO -dontwarn org.kxml2.io.** -dontwarn org.xmlpull.v1.** @@ -50,9 +46,6 @@ -keep class org.xmlpull.** { *; } -keepclassmembers class org.xmlpull.** { *; } -# IJK --keep class tv.danmaku.ijk.media.player.** { *; } - # Jianpian -keep class com.p2p.** { *; } @@ -86,9 +79,6 @@ # XunLei -keep class com.xunlei.downloadlib.** { *; } -# ZLive --keep class com.sun.jna.** { *; } --keep class com.east.android.zlive.** { *; } - # Zxing --keep class com.google.zxing.** { *; } \ No newline at end of file +-keep class com.google.zxing.EncodeHintType { *; } +-keep class com.google.zxing.MultiFormatWriter { *; } \ No newline at end of file diff --git a/build.gradle b/build.gradle index 04d37412c..52c22b431 100644 --- a/build.gradle +++ b/build.gradle @@ -12,5 +12,5 @@ project.ext { gsonVersion = '2.13.2' glideVersion = '5.0.5' media3Version = '1.8.0' - okhttpVersion = '5.1.0' + okhttpVersion = '5.2.1' } diff --git a/catvod/build.gradle b/catvod/build.gradle index 38f97b7b9..6eda59ed5 100644 --- a/catvod/build.gradle +++ b/catvod/build.gradle @@ -22,14 +22,12 @@ dependencies { api 'androidx.annotation:annotation:1.9.1' api 'androidx.preference:preference:1.2.1' api 'com.google.code.gson:gson:' + gsonVersion - api 'com.google.net.cronet:cronet-okhttp:0.1.0' api 'com.googlecode.juniversalchardet:juniversalchardet:1.0.3' api 'com.orhanobut:logger:2.2.0' api 'com.squareup.okhttp3:okhttp:' + okhttpVersion api 'com.squareup.okhttp3:okhttp-dnsoverhttps:' + okhttpVersion api 'com.squareup.okhttp3:logging-interceptor:' + okhttpVersion - api 'org.chromium.net:cronet-embedded:76.3809.111' - api('com.google.guava:guava:33.3.1-android') { + api('com.google.guava:guava:33.5.0-android') { exclude group: 'com.google.code.findbugs', module: 'jsr305' exclude group: 'org.checkerframework', module: 'checker-compat-qual' exclude group: 'org.checkerframework', module: 'checker-qual'