Merge remote-tracking branch 'origin/master'

2 years ago · 993a83b248
parent d4261ccd02 2787cf860b
commit 993a83b248
5 changed files with 3 additions and 2 deletions
--- a/app/cronetlib/cronet_api.jar
+++ b/app/cronetlib/cronet_api.jar
--- a/app/cronetlib/cronet_impl_common_java.jar
+++ b/app/cronetlib/cronet_impl_common_java.jar
--- a/app/src/main/assets/cronet.json
+++ b/app/src/main/assets/cronet.json
@ -1 +1 @@
-{"armeabi-v7a":"a36bb21eec579e2c4bed0009eb0f1587","x86":"afce9bdd790c215374bb906919179ca5","arm64-v8a":"3ea9fa21d9b18860cfa12957c39dded1","x86_64":"717c1ebe0d1d3562f5c91c2b2606d2c2","version":"104.0.5112.69"}
+{"arm64-v8a":"983026b83f3d1dafe223d63e157fb37d","armeabi-v7a":"98d6d0ec3fec519c48a4451b08806c27","x86_64":"7f96e681740c0f7080fcb4623f6294a6","x86":"24b6985f3cd6fe26541b440ef50c12bb","version":"104.0.5112.97"}
--- a/app/src/main/assets/updateLog.md
+++ b/app/src/main/assets/updateLog.md
@ -13,6 +13,7 @@

 **2022/08/02**

+* 更新cronet: 104.0.5112.97
 * 更新cronet: 104.0.5112.69
 * 修复一些bug by 821938089
 * 备份自定义直链上传规则
--- a/gradle.properties
+++ b/gradle.properties
@ -26,4 +26,4 @@ android.experimental.enableNewResourceShrinker.preciseShrinking=true
 # and none from the library's dependencies, thereby reducing the size of the R class for that library.
 android.nonTransitiveRClass=true
 #https://chromiumdash.appspot.com/releases?platform=Android
-CronetVersion=104.0.5112.69
+CronetVersion=104.0.5112.97