lib grade

REBOOTERS · REBOOTERS · commit ecc6331cb7de · 2025-07-17T19:51:19.000+08:00
diff --git a/app/build.gradle b/app/build.gradle
@@ -85,15 +85,15 @@ android {
         free {
             versionNameSuffix "_free"
             resourceConfigurations += ['ch', 'xhdpi']
-            minSdk 23
+            minSdk 26
             aaptOptions.cruncherEnabled = false
             ext.alwaysUpdateBuildId = false
         }
 
         charge {
             versionNameSuffix "_charge"
             resourceConfigurations += ['en', 'xhdpi']
-            minSdk 23
+            minSdk 26
             aaptOptions.cruncherEnabled = false
             ext.alwaysUpdateBuildId = false
         }
@@ -145,21 +145,21 @@ 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.14'
-    implementation 'com.squareup.okio:okio:3.11.0'
+    implementation 'com.squareup.okhttp3:okhttp:5.1.0'
+    implementation 'com.squareup.okio:okio:3.15.0'
     implementation 'androidx.multidex:multidex:2.0.1'
     implementation 'androidx.vectordrawable:vectordrawable:1.2.0'
     implementation "androidx.constraintlayout:constraintlayout:$constraint_layout"
 
     implementation 'com.github.bingoogolapple:BGARefreshLayout-Android:2.0.1'
     implementation 'com.github.bingoogolapple:BGABanner-Android:3.0.1'
-    implementation 'com.github.bingoogolapple:BGABaseAdapter-Android:1.2.0'
+    implementation 'com.github.bingoogolapple:BGABaseAdapter-Android:2.0.1'
     implementation 'com.jakewharton:butterknife:10.2.3'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     kapt 'com.jakewharton:butterknife-compiler:10.2.3'
     implementation 'com.facebook.stetho:stetho:1.6.0'
     implementation 'androidx.dynamicanimation:dynamicanimation:1.1.0'
-    implementation 'com.airbnb.android:lottie:6.6.6'
+    implementation 'com.airbnb.android:lottie:6.6.7'
     implementation 'com.davemorrissey.labs:subsampling-scale-image-view:3.10.0'
 //    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.14'
     implementation 'net.sourceforge.streamsupport:streamsupport:1.7.4'
@@ -168,7 +168,7 @@ dependencies {
     kapt "com.alibaba:arouter-compiler:$ext.arouter_compiler"
 
     implementation "androidx.palette:palette-ktx:1.0.0"
-    implementation 'com.tencent:mmkv:2.2.1'
+    implementation 'com.tencent:mmkv:2.2.2'
 
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test:runner:1.6.2'
@@ -198,7 +198,7 @@ dependencies {
     implementation project(path: ':subs:dataview')
     implementation project(path: ':subs:skeleton')
     implementation project(path: ':subs:compose')
-    implementation 'com.alibaba:fastjson:2.0.19.graal'
+    implementation 'com.alibaba:fastjson:2.0.57'
 
 }
 
diff --git a/app/src/main/java/home/smart/fly/animations/bga/ContentAdapter.java b/app/src/main/java/home/smart/fly/animations/bga/ContentAdapter.java
@@ -2,8 +2,9 @@
 
 import androidx.recyclerview.widget.RecyclerView;
 
-import cn.bingoogolapple.androidcommon.adapter.BGARecyclerViewAdapter;
-import cn.bingoogolapple.androidcommon.adapter.BGAViewHolderHelper;
+
+import cn.bingoogolapple.baseadapter.BGARecyclerViewAdapter;
+import cn.bingoogolapple.baseadapter.BGAViewHolderHelper;
 import home.smart.fly.animations.R;
 
 /**
diff --git a/app/src/main/java/home/smart/fly/animations/master/adapter/ModeSelectorAdapter.java b/app/src/main/java/home/smart/fly/animations/master/adapter/ModeSelectorAdapter.java
@@ -2,8 +2,8 @@
 
 import androidx.recyclerview.widget.RecyclerView;
 
-import cn.bingoogolapple.androidcommon.adapter.BGARecyclerViewAdapter;
-import cn.bingoogolapple.androidcommon.adapter.BGAViewHolderHelper;
+import cn.bingoogolapple.baseadapter.BGARecyclerViewAdapter;
+import cn.bingoogolapple.baseadapter.BGAViewHolderHelper;
 import home.smart.fly.animations.R;
 import home.smart.fly.animations.master.Tools;
 
diff --git a/app/src/main/java/home/smart/fly/animations/master/ui/MasterPaintActivity.java b/app/src/main/java/home/smart/fly/animations/master/ui/MasterPaintActivity.java
@@ -17,7 +17,7 @@
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import cn.bingoogolapple.androidcommon.adapter.BGAOnRVItemClickListener;
+import cn.bingoogolapple.baseadapter.BGAOnRVItemClickListener;
 import home.smart.fly.animations.R;
 import home.smart.fly.animations.master.Tools;
 import home.smart.fly.animations.master.adapter.ModeSelectorAdapter;
diff --git a/app/src/main/java/home/smart/fly/animations/ui/activity/MatisseDemoActivity.java b/app/src/main/java/home/smart/fly/animations/ui/activity/MatisseDemoActivity.java
@@ -26,9 +26,10 @@
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import cn.bingoogolapple.androidcommon.adapter.BGAOnRVItemClickListener;
-import cn.bingoogolapple.androidcommon.adapter.BGARecyclerViewAdapter;
-import cn.bingoogolapple.androidcommon.adapter.BGAViewHolderHelper;
+
+import cn.bingoogolapple.baseadapter.BGAOnRVItemClickListener;
+import cn.bingoogolapple.baseadapter.BGARecyclerViewAdapter;
+import cn.bingoogolapple.baseadapter.BGAViewHolderHelper;
 import home.smart.fly.animations.R;
 import home.smart.fly.animations.internal.annotations.Cat;
 import home.smart.fly.animations.utils.GifSizeFilter;
diff --git a/app/src/main/java/home/smart/fly/animations/ui/activity/WeiXinGalleryActivity.java b/app/src/main/java/home/smart/fly/animations/ui/activity/WeiXinGalleryActivity.java
@@ -16,8 +16,8 @@
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import cn.bingoogolapple.androidcommon.adapter.BGARecyclerViewAdapter;
-import cn.bingoogolapple.androidcommon.adapter.BGAViewHolderHelper;
+import cn.bingoogolapple.baseadapter.BGARecyclerViewAdapter;
+import cn.bingoogolapple.baseadapter.BGAViewHolderHelper;
 import home.smart.fly.animations.R;
 import home.smart.fly.animations.utils.Tools;
 
diff --git a/build.gradle b/build.gradle
@@ -1,11 +1,11 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 plugins {
-    id 'com.android.application' version '8.11.0' apply false
-    id 'com.android.library' version '8.11.0' apply false
-    id 'org.jetbrains.kotlin.android' version '2.0.20' apply false
-    id 'com.google.devtools.ksp' version '2.0.10-1.0.24' apply false
-    id 'org.jetbrains.kotlin.plugin.compose' version '2.0.20' apply false
+    id 'com.android.application' version '8.11.1' apply false
+    id 'com.android.library' version '8.11.1' apply false
+    id 'org.jetbrains.kotlin.android' version '2.2.0' apply false
+    id 'com.google.devtools.ksp' version '2.2.0-2.0.2' apply false
+    id 'org.jetbrains.kotlin.plugin.compose' version '2.2.0' apply false
 }
 apply from: file('config.gradle')
 //buildscript {
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:2.1.20'
+    implementation 'org.jetbrains.kotlin:kotlin-stdlib:2.2.0'
     // 添加了这个，就可以看 Android Gradle 插件的源码了
-    implementation 'com.android.tools.build:gradle-api:8.11.0'
+    implementation 'com.android.tools.build:gradle-api:8.11.1'
 //    implementation "org.jetbrains.kotlin:kotlin-script-runtime:1.3.40"
     implementation 'com.google.code.gson:gson:2.13.1'
-    implementation 'com.android.tools:common:31.9.2'
+    implementation 'com.android.tools:common:31.11.1'
     implementation 'commons-io:commons-io:2.19.0'
 //    implementation 'org.ow2.asm:asm:7.0'
     implementation 'org.ow2.asm:asm-commons:9.8'
diff --git a/config.gradle b/config.gradle
@@ -1,7 +1,7 @@
 ext {
     compileSdk = 35
 
-    minSdk = 23
+    minSdk = 26
     targetSdk = 35
 
 
diff --git a/gradle/app_check.gradle b/gradle/app_check.gradle
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,22 +1,30 @@
 [versions]
 agp = "8.7.0"
+dagger = "2.57"
+daggerCompiler = "2.57"
 kotlin = "2.0.0"
 coreKtx = "1.16.0"
 junit = "4.14-SNAPSHOT"
 junitVersion = "1.2.1"
 espressoCore = "3.6.1"
-lifecycleRuntimeKtx = "2.8.7"
+lifecycleRuntimeKtx = "2.9.2"
 activityCompose = "1.10.1"
-composeBom = "2025.04.01"
+composeBom = "2025.07.00"
 coilCompose = "2.7.0"
-composeRuntimeLiveData= "1.8.0"
+composeRuntimeLiveData= "1.8.3"
 accompanistPager = "0.36.0"
-lifecycleViewmodelCompose = "2.8.7"
-kotlinVersion = "2.0.21"
+lifecycleViewmodelCompose = "2.9.2"
+kotlinVersion = "2.2.0"
+roomRxjava2 = "2.7.2"
 
 
 [libraries]
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
+androidx-lifecycle-process = { module = "androidx.lifecycle:lifecycle-process", version.ref = "lifecycleRuntimeKtx" }
+androidx-lifecycle-viewmodel-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "lifecycleRuntimeKtx" }
+androidx-room-rxjava2 = { module = "androidx.room:room-rxjava2", version.ref = "roomRxjava2" }
+dagger-compiler = { module = "com.google.dagger:dagger-compiler", version.ref = "daggerCompiler" }
+dagger = { module = "com.google.dagger:dagger", version.ref = "dagger" }
 junit = { group = "junit", name = "junit", version.ref = "junit" }
 androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" }
 androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" }
diff --git a/imitate/build.gradle b/imitate/build.gradle
@@ -139,8 +139,8 @@ 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.8.7'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.7'
+    implementation libs.androidx.lifecycle.process
+    implementation libs.androidx.lifecycle.viewmodel.ktx
 
 
     testImplementation 'junit:junit:4.13.2'
@@ -210,7 +210,7 @@ dependencies {
 
     //room 
     implementation "androidx.room:room-runtime:$ext.roomVersion_runtime"
-    implementation "androidx.room:room-rxjava2:$ext.roomVersion"
+    implementation libs.androidx.room.rxjava2
 //    kapt 'org.xerial:sqlite-jdbc:3.36.0.3' // for mac m1
     kapt "androidx.room:room-compiler:$ext.roomVersion"
 
@@ -222,10 +222,10 @@ dependencies {
 
     // from 2021
     implementation 'com.beust:klaxon:5.6'
-    implementation 'com.alibaba:fastjson:2.0.19.graal'
-    implementation 'com.google.code.gson:gson:2.11.0'
-    implementation 'com.google.dagger:dagger:2.56.2'
-    kapt 'com.google.dagger:dagger-compiler:2.56.2'
+    implementation 'com.alibaba:fastjson:2.0.57'
+    implementation 'com.google.code.gson:gson:2.13.1'
+    implementation libs.dagger
+    kapt libs.dagger.compiler
 
     // coroutines
     //                                       👇 依赖协程核心库
