lib upgrade

REBOOTERS · Jun 21, 2024 · b909656 · b909656
1 parent 9210511
commit b909656
Show file tree

Hide file tree

Showing 12 changed files with 64 additions and 45 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -133,7 +133,7 @@ configurations.all {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'com.google.code.gson:gson:2.10.1'
+    implementation 'com.google.code.gson:gson:2.11.0'
     implementation "androidx.appcompat:appcompat:${ext.androidx_appcompat}"
     implementation "com.google.android.material:material:${ext.androidx_material}"
     implementation 'com.orhanobut:logger:2.2.0'
@@ -142,10 +142,10 @@ dependencies {
     implementation "androidx.legacy:legacy-support-v4:1.0.0"
     implementation "androidx.cardview:cardview:1.0.0"
     implementation "com.github.bumptech.glide:glide:$ext.glide"
-    implementation 'com.squareup.okhttp3:okhttp:5.0.0-alpha.12'
+    implementation 'com.squareup.okhttp3:okhttp:5.0.0-alpha.14'
     implementation 'com.squareup.okio:okio:3.9.0'
     implementation 'androidx.multidex:multidex:2.0.1'
-    implementation "androidx.vectordrawable:vectordrawable:1.1.0"
+    implementation 'androidx.vectordrawable:vectordrawable:1.2.0'
     implementation "androidx.constraintlayout:constraintlayout:$constraint_layout"
 
     implementation 'com.github.bingoogolapple:BGARefreshLayout-Android:2.0.1'
@@ -156,9 +156,9 @@ dependencies {
     kapt 'com.jakewharton:butterknife-compiler:10.2.3'
     implementation 'com.facebook.stetho:stetho:1.6.0'
     implementation "androidx.dynamicanimation:dynamicanimation:1.0.0"
-    implementation 'com.airbnb.android:lottie:6.4.0'
+    implementation 'com.airbnb.android:lottie:6.4.1'
     implementation 'com.davemorrissey.labs:subsampling-scale-image-view:3.10.0'
-    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.13'
+//    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.14'
     implementation 'net.sourceforge.streamsupport:streamsupport:1.7.4'
 
     implementation "com.alibaba:arouter-api:$ext.arouter_api"
@@ -174,10 +174,10 @@ dependencies {
     implementation 'com.jakewharton.hugo:hugo-runtime:1.2.1'
 
 
-    implementation 'com.facebook.fresco:fresco:3.1.3'
+    implementation 'com.facebook.fresco:fresco:3.2.0'
     implementation 'com.github.chrisbanes:PhotoView:2.1.4'
     implementation 'com.github.REBOOTERS:Matisse:v0.5.7'
-    implementation 'com.guolindev.permissionx:permissionx:1.7.1'
+    implementation 'com.guolindev.permissionx:permissionx:1.8.0'
     implementation 'io.reactivex.rxjava2:rxjava:2.2.21'
     implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
     implementation 'com.squareup.picasso:picasso:2.71828'

diff --git a/build.gradle b/build.gradle
@@ -1,8 +1,8 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 plugins {
-    id 'com.android.application' version '8.4.0' apply false
-    id 'com.android.library' version '8.4.0' apply false
+    id 'com.android.application' version '8.5.0' apply false
+    id 'com.android.library' version '8.5.0' apply false
     id 'org.jetbrains.kotlin.android' version '1.9.22' apply false
     id 'com.google.devtools.ksp' version '1.9.10-1.0.13' apply false
 }

diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
@@ -7,12 +7,12 @@ dependencies {
     // groovy sdk
     implementation gradleApi()
 //    implementation localGroovy()
-    implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.9.23'
+    implementation 'org.jetbrains.kotlin:kotlin-stdlib:2.0.0'
     // 添加了这个，就可以看 Android Gradle 插件的源码了
-    implementation 'com.android.tools.build:gradle-api:8.4.0'
+    implementation 'com.android.tools.build:gradle-api:8.5.0'
 //    implementation "org.jetbrains.kotlin:kotlin-script-runtime:1.3.40"
-    implementation 'com.google.code.gson:gson:2.10.1'
-    implementation 'com.android.tools:common:31.3.2'
+    implementation 'com.google.code.gson:gson:2.11.0'
+    implementation 'com.android.tools:common:31.5.0'
     implementation 'commons-io:commons-io:2.16.1'
 //    implementation 'org.ow2.asm:asm:7.0'
     implementation 'org.ow2.asm:asm-commons:9.7'

diff --git a/config.gradle b/config.gradle
@@ -6,13 +6,13 @@ ext {
 
 
     support_version = '1.3.2'
-    androidx_appcompat = '1.6.1'
-    androidx_material = '1.11.0'
+    androidx_appcompat = '1.7.0'
+    androidx_material = '1.12.0'
     androidx_preference = '1.2.1'
     constraint_layout = '2.1.4'
-    core_ktx = '1.12.0'
+    core_ktx = '1.13.1'
 
-    kotlin_version = '1.9.23'
+    kotlin_version = '2.0.0'
     gradle_version = '8.1.1'
 
     doraemonkit = '3.7.11'
@@ -29,6 +29,6 @@ ext {
     roomVersion_runtime = '2.6.1'
     archLifecycleVersion = '2.2.0'
 
-    kotlin_coroutines = '1.7.3'
-    kotlin_coroutines_android = '1.7.3'
+    kotlin_coroutines = '1.8.1'
+    kotlin_coroutines_android = '1.8.1'
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
diff --git a/imitate/build.gradle b/imitate/build.gradle
@@ -138,34 +138,34 @@ dependencies {
     implementation "androidx.constraintlayout:constraintlayout:${ext.constraint_layout}"
     implementation "com.github.bumptech.glide:glide:$ext.glide"
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'androidx.lifecycle:lifecycle-process:2.7.0'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0'
+    implementation 'androidx.lifecycle:lifecycle-process:2.8.2'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.2'
     implementation project(path: ':subs:cpp_native')
 
 
     testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test:runner:1.6.0-alpha04'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.0-alpha01'
+    androidTestImplementation 'androidx.test:runner:1.6.0-rc01'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.0-rc01'
 
 
     implementation "com.alibaba:arouter-api:$ext.arouter_api"
     kapt "com.alibaba:arouter-compiler:$ext.arouter_compiler"
-    implementation('com.facebook.fresco:fresco:3.1.3') {
+    implementation('com.facebook.fresco:fresco:3.2.0') {
         exclude group: 'com.facebook.soloader', module: 'soloader'
         exclude group: 'com.facebook.fresco', module: 'soloader'
         exclude group: 'com.facebook.fresco', module: 'nativeimagefilters'
         exclude group: 'com.facebook.fresco', module: 'nativeimagetranscoder'
         exclude group: 'com.facebook.fresco', module: 'memory-type-native'
         exclude group: 'com.facebook.fresco', module: 'imagepipeline-native'
     }
-    implementation 'com.facebook.fresco:animated-webp:3.1.3'
-    implementation 'com.facebook.fresco:webpsupport:3.1.3'
+    implementation 'com.facebook.fresco:animated-webp:3.2.0'
+    implementation 'com.facebook.fresco:webpsupport:3.2.0'
     implementation 'com.github.REBOOTERS:Matisse:v0.5.7'
-    implementation 'com.guolindev.permissionx:permissionx:1.7.1'
+    implementation 'com.guolindev.permissionx:permissionx:1.8.0'
     implementation 'io.reactivex.rxjava2:rxjava:2.2.21'
     implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
     implementation 'com.facebook.stetho:stetho:1.6.0'
-    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.13'
+//    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.14'
     implementation 'net.sourceforge.streamsupport:streamsupport:1.7.4'
     //
     implementation 'com.github.andrefrsousa:SuperBottomSheet:1.3.0'
@@ -176,7 +176,7 @@ dependencies {
     implementation 'com.afollestad:assent:2.3.1'
 
 
-    implementation "androidx.viewpager2:viewpager2:1.0.0"
+    implementation 'androidx.viewpager2:viewpager2:1.1.0'
 
     // https://github.com/prostory/AndroidZdog
     implementation 'com.github.prostory:AndroidZdog:v1.0.0'
@@ -229,24 +229,26 @@ dependencies {
     implementation 'com.github.skydoves:transformationlayout:1.1.3'
     implementation 'com.beust:klaxon:5.6'
     implementation 'com.alibaba:fastjson:2.0.19.graal'
-    implementation 'com.google.code.gson:gson:2.10.1'
-    implementation 'com.google.dagger:dagger:2.50'
-    kapt 'com.google.dagger:dagger-compiler:2.50'
+    implementation 'com.google.code.gson:gson:2.11.0'
+    implementation 'com.google.dagger:dagger:2.51.1'
+    kapt 'com.google.dagger:dagger-compiler:2.51.1'
 
     // coroutines
     //                                       👇 依赖协程核心库
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlin_coroutines"
     //                                       👇 依赖当前平台所对应的平台库
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlin_coroutines_android"
 
-    implementation  'io.github.scwang90:refresh-layout-kernel:2.0.6'      //核心必须依赖
-    implementation  'io.github.scwang90:refresh-header-classics:2.0.6'    //经典刷新头
-    implementation  'io.github.scwang90:refresh-header-radar:2.0.6'       //雷达刷新头
-    implementation  'io.github.scwang90:refresh-header-falsify:2.0.6'     //虚拟刷新头
-    implementation  'io.github.scwang90:refresh-header-material:2.0.6'    //谷歌刷新头
-    implementation  'io.github.scwang90:refresh-header-two-level:2.0.6'   //二级刷新头
+    implementation 'io.github.scwang90:refresh-layout-kernel:2.1.0'      //核心必须依赖
+    implementation 'io.github.scwang90:refresh-header-classics:2.1.0'    //经典刷新头
+    implementation 'io.github.scwang90:refresh-header-radar:2.1.0'       //雷达刷新头
+    implementation 'io.github.scwang90:refresh-header-falsify:2.1.0'     //虚拟刷新头
+    implementation 'io.github.scwang90:refresh-header-material:2.1.0'    //谷歌刷新头
+    implementation 'io.github.scwang90:refresh-header-two-level:2.1.0'   //二级刷新头
     implementation 'io.github.scwang90:refresh-footer-ball:2.1.0'        //球脉冲加载
-    implementation  'io.github.scwang90:refresh-footer-classics:2.0.6'    //经典加载
+    implementation 'io.github.scwang90:refresh-footer-classics:2.1.0'    //经典加载
 
     implementation 'androidx.metrics:metrics-performance:1.0.0-beta01'
+
+    implementation 'com.github.daquexian:FlexibleRichTextView:0.8.2'
 }
diff --git a/imitate/src/main/java/com/engineer/imitate/ui/activity/GroundDuActivity.kt b/imitate/src/main/java/com/engineer/imitate/ui/activity/GroundDuActivity.kt
@@ -1,9 +1,9 @@
 package com.engineer.imitate.ui.activity
 
 import android.os.Bundle
-import android.view.LayoutInflater
 import androidx.appcompat.app.AppCompatActivity
 import com.engineer.imitate.databinding.ActivityGroundDuBinding
+import org.scilab.forge.jlatexmath.core.AjLatexMath
 
 class GroundDuActivity : AppCompatActivity() {
     private lateinit var viewBinding: ActivityGroundDuBinding
@@ -22,5 +22,15 @@ class GroundDuActivity : AppCompatActivity() {
             }
             show = !show
         }
+
+
+        AjLatexMath.init(this)
+
+        val richText = "[h][center]hi![/center][/h][quote]This is quote[/quote][code]print" +
+                "(\"Hello FlexibleRichTextView!\")[/code]Hello FlexibleRichTextView!This " +
+                "isLaTeX:$\\e^{pi i} + 1 = 0$"
+        viewBinding.richTv.setText(richText)
     }
+
+
 }
diff --git a/imitate/src/main/res/layout/activity_ground_du.xml b/imitate/src/main/res/layout/activity_ground_du.xml
@@ -22,6 +22,10 @@
             android:id="@+id/test_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content" />
+        <com.daquexian.flexiblerichtextview.FlexibleRichTextView
+            android:id="@+id/richTv"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"/>
 
     </LinearLayout>
 

diff --git a/subs/ai/build.gradle b/subs/ai/build.gradle
@@ -51,8 +51,8 @@ dependencies {
 
     // AndroidDraw Library
     implementation 'com.github.divyanshub024:AndroidDraw:v0.1'
-    implementation('org.tensorflow:tensorflow-lite:2.15.0') {
+    implementation('org.tensorflow:tensorflow-lite:2.16.1') {
         exclude group: "com.google.inject", module: "guice"
     }
-    implementation 'com.google.android.gms:play-services-tasks:18.1.0'
+    implementation 'com.google.android.gms:play-services-tasks:18.2.0'
 }
diff --git a/subs/cpp_native/build.gradle b/subs/cpp_native/build.gradle
@@ -18,6 +18,9 @@ android {
                 cppFlags ''
             }
         }
+        ndk {
+            abiFilters "arm64-v8a"
+        }
     }
 
     buildTypes {

diff --git a/subs/dataview/build.gradle b/subs/dataview/build.gradle
@@ -32,7 +32,7 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'androidx.appcompat:appcompat:1.7.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test:runner:1.5.2'

diff --git a/subs/gif-revert/build.gradle b/subs/gif-revert/build.gradle
@@ -33,7 +33,7 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'androidx.appcompat:appcompat:1.7.0'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test:runner:1.5.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,6 +18,9 @@ android { @@
                     cppFlags ''
                 }
             }
+            ndk {
+                abiFilters "arm64-v8a"
+            }
         }
         buildTypes {
@@ Expand Down @@