Merge remote-tracking branch 'origin/master'

3 years ago · 29cba0f41f
parent d52ea2be60 7ad0bd3f93
commit 29cba0f41f
8 changed files with 7 additions and 3 deletions
--- a/app/build.gradle
+++ b/app/build.gradle
@ -29,6 +29,9 @@ android {
                keyPassword RELEASE_KEY_PASSWORD
                v1SigningEnabled true
                v2SigningEnabled true
                enableV3Signing = true
                enableV4Signing = true
            }
        }
    }
--- 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/cronetlib/cronet_impl_native_java.jar
+++ b/app/cronetlib/cronet_impl_native_java.jar
--- a/app/cronetlib/cronet_impl_platform_java.jar
+++ b/app/cronetlib/cronet_impl_platform_java.jar
--- a/app/download.gradle
+++ b/app/download.gradle
@ -37,7 +37,7 @@ task downloadJar(type: Download) {
    ])
    dest libPath
    overwrite true
-    onlyIfModified true
+    onlyIfModified false
 }
 /**
 * 下载Cronet的arm64-v8a so
--- a/app/src/main/assets/cronet.json
+++ b/app/src/main/assets/cronet.json
@ -1 +1 @@
-{"x86":"1fdeb6068adf33655ba73e703b744b36","armeabi-v7a":"ac543f4218fe1a679e09c510583d93fa","x86_64":"4c12de088cf2c51b754ceea224bb5cc9","arm64-v8a":"99784a12b0ff18d6b7752c7488626f5b","version":"99.0.4844.48"}
+{"arm64-v8a":"df27e27ee769fd817c1ad6f2f6378abd","armeabi-v7a":"c4746896e8f23a88098655779ee9caa5","x86":"9b3028a8d79cc3646ba20f51fc0ea175","x86_64":"845c50a84451ee9a92bb6ac223e2554b","version":"99.0.4844.58"}
--- a/gradle.properties
+++ b/gradle.properties
@ -22,4 +22,5 @@ kotlin.code.style=official
 android.enableResourceOptimizations=true
-CronetVersion=99.0.4844.48
+#https://chromiumdash.appspot.com/releases?platform=Android
 CronetVersion=99.0.4844.58
		`@ -1 +1 @@`
			`{"x86":"1fdeb6068adf33655ba73e703b744b36","armeabi-v7a":"ac543f4218fe1a679e09c510583d93fa","x86_64":"4c12de088cf2c51b754ceea224bb5cc9","arm64-v8a":"99784a12b0ff18d6b7752c7488626f5b","version":"99.0.4844.48"}`				`{"arm64-v8a":"df27e27ee769fd817c1ad6f2f6378abd","armeabi-v7a":"c4746896e8f23a88098655779ee9caa5","x86":"9b3028a8d79cc3646ba20f51fc0ea175","x86_64":"845c50a84451ee9a92bb6ac223e2554b","version":"99.0.4844.58"}`