diff --git a/app/cronet-proguard-rules.pro b/app/cronet-proguard-rules.pro index f2737579a..b5d8bc310 100644 --- a/app/cronet-proguard-rules.pro +++ b/app/cronet-proguard-rules.pro @@ -113,6 +113,14 @@ -identifiernamestring class * { @org.chromium.build.annotations.IdentifierNameString *; } + +# Mark fields with this to help R8 figure out that they cannot be null. +-assumenosideeffects class ** { + @org.chromium.build.annotations.AssumeNonNull *** *(...) return _NONNULL_; +} +-assumenosideeffects class ** { + @org.chromium.build.annotations.AssumeNonNull *** * return _NONNULL_; +} # -------- Config Path: components/cronet/android/cronet_impl_common_proguard.cfg -------- # Proguard config for apps that depend on cronet_impl_common_java.jar. diff --git a/app/cronetlib/cronet_api.jar b/app/cronetlib/cronet_api.jar index b7a63bbca..a5eab02a8 100644 Binary files a/app/cronetlib/cronet_api.jar and b/app/cronetlib/cronet_api.jar differ diff --git a/app/cronetlib/cronet_impl_common_java.jar b/app/cronetlib/cronet_impl_common_java.jar index 4bbe0a8d9..3ab5a9fc9 100644 Binary files a/app/cronetlib/cronet_impl_common_java.jar and b/app/cronetlib/cronet_impl_common_java.jar differ diff --git a/app/cronetlib/cronet_impl_native_java.jar b/app/cronetlib/cronet_impl_native_java.jar index 842cdea6f..c4cf6bf51 100644 Binary files a/app/cronetlib/cronet_impl_native_java.jar and b/app/cronetlib/cronet_impl_native_java.jar differ diff --git a/app/cronetlib/cronet_impl_platform_java.jar b/app/cronetlib/cronet_impl_platform_java.jar index 05468748d..c3124a990 100644 Binary files a/app/cronetlib/cronet_impl_platform_java.jar and b/app/cronetlib/cronet_impl_platform_java.jar differ diff --git a/app/cronetlib/cronet_shared_java.jar b/app/cronetlib/cronet_shared_java.jar index 2700521b4..2bf261ec7 100644 Binary files a/app/cronetlib/cronet_shared_java.jar and b/app/cronetlib/cronet_shared_java.jar differ diff --git a/app/src/main/assets/cronet.json b/app/src/main/assets/cronet.json index 412a3d89c..1564ca2f7 100644 --- a/app/src/main/assets/cronet.json +++ b/app/src/main/assets/cronet.json @@ -1 +1 @@ -{"arm64-v8a":"bbf2c50d1ebf0763d451b08e290a3244","armeabi-v7a":"ecb872f7b1b5342f4d7c36262bec0600","x86":"4da4832b89e2412d808c5b1ecdc24e3d","x86_64":"62080f051db02ed0e939affb39ce67fb","version":"123.0.6312.80"} \ No newline at end of file +{"x86":"1f6a04c292840a72e9822582950921fb","arm64-v8a":"e1799b697f168add1df9bd30004c4608","armeabi-v7a":"7315fe481065969cdad417058341f3be","x86_64":"c5b2700583ec3e46ff4d0b8d953d94f9","version":"125.0.6422.147"} \ No newline at end of file diff --git a/app/src/main/assets/updateLog.md b/app/src/main/assets/updateLog.md index bc4983fe8..89566a45f 100644 --- a/app/src/main/assets/updateLog.md +++ b/app/src/main/assets/updateLog.md @@ -13,6 +13,7 @@ * 漫画源看书显示乱码,**阅读与其他软件的源并不通用**,请导入阅读的支持的漫画源! **2024/02/27** +* 更新cronet: 125.0.6422.147 * 更新cronet: 123.0.6312.80 * 更新cronet: 123.0.6312.40 diff --git a/gradle.properties b/gradle.properties index 908bccc9f..85fbd57c6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -42,7 +42,7 @@ android.defaults.buildfeatures.shaders=false # 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=123.0.6312.80 -CronetMainVersion=123.0.0.0 +CronetVersion=125.0.6422.147 +CronetMainVersion=125.0.0.0 android.injected.testOnly=false android.nonFinalResIds=true \ No newline at end of file