update

ag2s20150909 · Dec 18, 2022 · 4c6a4c3 · 4c6a4c3
1 parent b7b9dd0
commit 4c6a4c3
Show file tree

Hide file tree

Showing 26 changed files with 152 additions and 179 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -62,7 +62,7 @@ dependencies {
     implementation project(path: ':glide')
     implementation project(path: ':okhttp-kt')
 
-    def composeBom = platform('androidx.compose:compose-bom:2022.11.00')
+    def composeBom = platform('androidx.compose:compose-bom:2022.12.00')
     implementation composeBom
     androidTestImplementation composeBom
 

diff --git a/cronet/108.0.5359.128/arm64-v8a/libcronet.108.0.5359.128.so b/cronet/108.0.5359.128/arm64-v8a/libcronet.108.0.5359.128.so
diff --git a/cronet/108.0.5359.128/arm64-v8a/libcronet.108.0.5359.128.so.js b/cronet/108.0.5359.128/arm64-v8a/libcronet.108.0.5359.128.so.js
@@ -0,0 +1 @@
+77228743b00c1a7ee0ec722229a7c6ba
diff --git a/cronet/108.0.5359.128/armeabi-v7a/libcronet.108.0.5359.128.so b/cronet/108.0.5359.128/armeabi-v7a/libcronet.108.0.5359.128.so
diff --git a/cronet/108.0.5359.128/armeabi-v7a/libcronet.108.0.5359.128.so.js b/cronet/108.0.5359.128/armeabi-v7a/libcronet.108.0.5359.128.so.js
@@ -0,0 +1 @@
+c4c855612c3cdead96702a41571f2ed3
diff --git a/cronet/108.0.5359.128/libs/cronet_api.jar b/cronet/108.0.5359.128/libs/cronet_api.jar
diff --git a/cronet/108.0.5359.128/libs/cronet_impl_common_java.jar b/cronet/108.0.5359.128/libs/cronet_impl_common_java.jar
diff --git a/cronet/108.0.5359.128/libs/cronet_impl_native_java.jar b/cronet/108.0.5359.128/libs/cronet_impl_native_java.jar
diff --git a/cronet/108.0.5359.128/libs/cronet_impl_platform_java.jar b/cronet/108.0.5359.128/libs/cronet_impl_platform_java.jar
diff --git a/cronet/108.0.5359.128/x86/libcronet.108.0.5359.128.so b/cronet/108.0.5359.128/x86/libcronet.108.0.5359.128.so
diff --git a/cronet/108.0.5359.128/x86/libcronet.108.0.5359.128.so.js b/cronet/108.0.5359.128/x86/libcronet.108.0.5359.128.so.js
@@ -0,0 +1 @@
+6cdf8e3e9ced5ad7ae506245e3231d74
diff --git a/cronet/108.0.5359.128/x86_64/libcronet.108.0.5359.128.so b/cronet/108.0.5359.128/x86_64/libcronet.108.0.5359.128.so
diff --git a/cronet/108.0.5359.128/x86_64/libcronet.108.0.5359.128.so.js b/cronet/108.0.5359.128/x86_64/libcronet.108.0.5359.128.so.js
@@ -0,0 +1 @@
+afa8e7db75f19f939c9eca3b0aaa46d7
diff --git a/gradle.properties b/gradle.properties
@@ -34,6 +34,6 @@ android.defaults.buildfeatures.shaders=false
 includeCronetSo=false
 # ??Cronet??
 # Set Cronet Version
-CronetVersion=108.0.5359.60
+CronetVersion=108.0.5359.127
 PROJ_GROUP=me.ag2s.cronet
-PROJ_VERSION=108.0.5359.61
+PROJ_VERSION=108.0.5359.128
diff --git a/library/cronet/build.gradle b/library/cronet/build.gradle
@@ -70,7 +70,7 @@ dependencies {
 
 
     testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.4'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0'
 }
 

diff --git a/library/cronet/libs/cronet_api.jar b/library/cronet/libs/cronet_api.jar
diff --git a/library/cronet/libs/cronet_impl_common_java.jar b/library/cronet/libs/cronet_impl_common_java.jar
diff --git a/library/cronet/src/main/assets/cronet.json b/library/cronet/src/main/assets/cronet.json
@@ -1,7 +1,7 @@
 {
-  "arm64-v8a": "18f67a75cf9414ceb0a330ccbbe8f08d",
-  "armeabi-v7a": "b6cbbbffa950dc6c35113c15f78028d9",
-  "x86": "fde0d57b102473f9efe9914df873308b",
-  "x86_64": "ed569708fcc3bf76683e83f4881dab12",
-  "version": "108.0.5359.61"
+  "arm64-v8a": "77228743b00c1a7ee0ec722229a7c6ba",
+  "armeabi-v7a": "c4c855612c3cdead96702a41571f2ed3",
+  "x86": "6cdf8e3e9ced5ad7ae506245e3231d74",
+  "x86_64": "afa8e7db75f19f939c9eca3b0aaa46d7",
+  "version": "108.0.5359.128"
 }
diff --git a/library/cronet/src/main/java/me/ag2s/cronet/CronetLoader.java b/library/cronet/src/main/java/me/ag2s/cronet/CronetLoader.java
@@ -158,7 +158,7 @@ private static synchronized void download(final String url, final String md5, fi
      * @return
      */
 
-    public boolean need() {
+    private boolean need() {
         return !(isGMS || includeCronetSo);
     }
 
@@ -193,16 +193,16 @@ public static boolean isHW() {
      *
      * @return true or false
      */
-    public boolean install() {
+    public boolean isJavaImplement() {
         ins = getInstallType();
-        return !ins.equals(CronetState.Java);
+        return ins.equals(CronetState.Java);
 
     }
 
     /**
      * 检测Cronet So 是否存在
      *
-     * @return
+     * @return boolean
      */
     public boolean checkCronetNative() {
         if (md5 == null || md5.length() != 32 || !soFile.exists()) {

diff --git a/library/glide/build.gradle b/library/glide/build.gradle
@@ -41,6 +41,6 @@ dependencies {
     annotationProcessor "com.github.bumptech.glide:compiler:$glide_version"
 
     testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.4'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0'
 }
diff --git a/library/glide/src/main/java/me/ag2s/cronet/glide/BufferQueue.java b/library/glide/src/main/java/me/ag2s/cronet/glide/BufferQueue.java