Merge remote-tracking branch 'origin/main'

# Conflicts:
#	app/build.gradle
#	quickjs/build.gradle

app/build.gradle

@@ -70,6 +70,7 @@ dependencies {
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
     implementation files('libs/thunder.jar')
     implementation files('libs/commons-lang3-3.12.0.jar')
+    implementation 'org.conscrypt:conscrypt-android:2.5.2'
     implementation files('libs/xwalk_shared_library-23.53.589.4.aar')
 
     implementation 'com.squareup.okhttp3:okhttp:3.12.11'
@@ -99,7 +100,7 @@ dependencies {
     implementation 'com.owen:tv-recyclerview:3.0.0'
 
     implementation 'com.github.getActivity:XXPermissions:13.6'
-    implementation 'org.jsoup:jsoup:1.14.1'
+    implementation 'org.jsoup:jsoup:1.16.2'
     implementation 'com.github.hedzr:android-file-chooser:v1.2.0-final'
     implementation 'commons-io:commons-io:2.11.0'
     implementation 'com.googlecode.juniversalchardet:juniversalchardet:1.0.3'

app/proguard-rules.pro

@@ -202,12 +202,12 @@
 # 迅雷下载模块
 -keep class com.xunlei.downloadlib.** {*;}
 # quickjs引擎
--keep class com.github.tvbox.quickjs.** {*;}
+-keep class com.whl.quickjs.** {*;}
 # 支持影视的ali相关的jar
 -keep class com.google.gson.**{*;}
 # Zxing
 -keep class com.google.zxing.**{*;}
 -keepclassmembers enum * {
     public static **[] values();
     public static ** valueOf(java.lang.String);
-}
+}