update dependencies and plugins

aiueonicked · Feb 28, 2024 · a8af9b9 · a8af9b9
1 parent 05b2c85
commit a8af9b9
Show file tree

Hide file tree

Showing 9 changed files with 73 additions and 63 deletions.
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -5,15 +5,16 @@ apply plugin: 'kotlin-parcelize'
 apply plugin: 'com.google.gms.google-services'
 apply plugin: 'com.google.firebase.crashlytics'
 apply plugin: 'org.jmailen.kotlinter'
+apply plugin: 'com.google.devtools.ksp'
 apply plugin: "androidx.navigation.safeargs"
 
 android {
-    compileSdkVersion 33
+    compileSdk 34
 
     defaultConfig {
         applicationId "ceui.lisa.pixiv"
         minSdkVersion 21
-        targetSdkVersion 33
+        targetSdk 34
         versionCode 260
         versionName "3.3.5"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -22,13 +23,14 @@ android {
             annotationProcessorOptions {
                 arguments = [
                         //必须，告知RxHttp你依赖的okhttp版本，目前已适配 v3.12.0 - v4.9.1版本  (v4.3.0除外)
-                        rxhttp_okhttp : '4.4.1',
-                        //使用asXxx方法时必须，告知RxHttp你依赖的rxjava版本，可传入rxjava2、rxjava3或具体的版本号
-                        rxhttp_rxjava : '3.1.3',
-                        rxhttp_package: 'rxhttp'   //非必须，指定RxHttp类包名
+                        rxhttp_okhttp : '4.12.0',
+                        rxhttp_package: 'rxhttp'
                 ]
             }
         }
+        ksp {
+            arg("rxhttp_rxjava", "3.2.4")
+        }
     }
 
     signingConfigs {
@@ -104,19 +106,19 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'androidx.recyclerview:recyclerview:1.2.1'
-    implementation 'com.google.android.material:material:1.8.0'
+    implementation 'androidx.recyclerview:recyclerview:1.3.2'
+    implementation 'com.google.android.material:material:1.11.0'
 
     //=============== lifecycle
-    def lifecycle_version = '2.5.1'
+    def lifecycle_version = '2.7.0'
 
     implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
 
 
 
     //=============== Navigation
-    def nav_version = "2.5.3"
+    def nav_version = '2.7.7'
     implementation "androidx.navigation:navigation-fragment-ktx:$nav_version"
     implementation "androidx.navigation:navigation-ui-ktx:$nav_version"
 
@@ -133,9 +135,9 @@ dependencies {
     api 'io.reactivex.rxjava2:rxandroid:2.1.1'
 
 
-    implementation 'com.github.bumptech.glide:glide:4.14.2'
-    kapt 'com.github.bumptech.glide:compiler:4.14.2'
-    implementation ('com.github.bumptech.glide:okhttp3-integration:4.14.1'){
+    implementation "com.github.bumptech.glide:glide:4.16.0"
+    kapt "com.github.bumptech.glide:compiler:4.16.0"
+    implementation ('com.github.bumptech.glide:okhttp3-integration:4.16.0'){
         exclude group: 'glide-parent'
     }
 
@@ -145,40 +147,40 @@ dependencies {
 //    api 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.3'
 //    api 'com.scwang.smartrefresh:SmartRefreshHeader:1.1.3'
 
-    implementation  'io.github.scwang90:refresh-layout-kernel:2.0.5'      //核心必须依赖
-    implementation  'io.github.scwang90:refresh-header-classics:2.0.5'    //经典刷新头
-    implementation  'io.github.scwang90:refresh-header-radar:2.0.5'       //雷达刷新头
-    implementation  'io.github.scwang90:refresh-header-falsify:2.0.5'     //虚拟刷新头
-    implementation  'io.github.scwang90:refresh-header-material:2.0.5'    //谷歌刷新头
-    implementation  'io.github.scwang90:refresh-header-two-level:2.0.5'   //二级刷新头
-    implementation  'io.github.scwang90:refresh-footer-ball:2.0.5'        //球脉冲加载
-    implementation  'io.github.scwang90:refresh-footer-classics:2.0.5'    //经典加载
+    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.1.0'    //经典加载
 
     // okhttp3系列组件版本最高到 4.4.1，参看 RubySSLSocketFactory
-    implementation 'com.squareup.okhttp3:logging-interceptor:4.4.1'
+    implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0'
     implementation 'com.rengwuxian.materialedittext:library:2.1.4'
     implementation 'jp.wasabeef:glide-transformations:4.3.0'
     implementation 'de.hdodenhof:circleimageview:3.1.0'
     implementation 'com.github.ybq:Android-SpinKit:1.4.0'
-    implementation 'androidx.room:room-runtime:2.5.0'
-    kapt 'androidx.room:room-compiler:2.5.0'
+    implementation 'androidx.room:room-runtime:2.6.1'
+    ksp 'androidx.room:room-compiler:2.6.1'
     implementation 'com.github.Justson.AgentWeb:agentweb-core:v4.1.9-androidx'
     implementation 'com.github.Justson.AgentWeb:agentweb-filechooser:v4.1.9-androidx'
     implementation 'com.facebook.rebound:rebound:0.3.8'
 //    implementation 'com.github.chrisbanes:PhotoView:2.3.0'
     implementation 'org.sufficientlysecure:html-textview:3.9'
     implementation 'com.wdullaer:materialdatetimepicker:4.2.3'
-    implementation 'com.qmuiteam:qmui:2.0.1'
+    implementation 'com.qmuiteam:qmui:2.1.0'
     implementation 'com.mxn.soul:flowingdrawer-core:2.1.0'
     implementation 'com.ToxicBakery.viewpager.transforms:view-pager-transforms:2.0.24'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
     implementation 'jp.wasabeef:recyclerview-animators:4.0.2'
     implementation 'gdut.bsx:share2:0.9.3'
-    implementation 'com.github.skydoves:transformationlayout:1.1.1'
-    implementation 'com.blankj:utilcodex:1.31.0'
+    implementation 'com.github.skydoves:transformationlayout:1.1.3'
+    implementation 'com.blankj:utilcodex:1.31.1'
     implementation 'com.safframework.log:saf-logginginterceptor:1.6.0'
-    implementation 'com.google.firebase:firebase-analytics:21.2.0'
-    implementation 'com.google.firebase:firebase-crashlytics:18.3.5'
+    implementation 'com.google.firebase:firebase-analytics:21.5.1'
+    implementation 'com.google.firebase:firebase-crashlytics:18.6.2'
 
     implementation 'com.afollestad:drag-select-recyclerview:2.4.0'
 
@@ -190,32 +192,33 @@ dependencies {
     implementation 'com.makeramen:roundedimageview:2.3.0'
 
 
-    implementation 'com.github.liujingxing.rxhttp:rxhttp:2.7.3'
+    implementation 'com.github.liujingxing.rxhttp:rxhttp:3.2.4'
     // okhttp3系列组件版本最高到 4.4.1，参看 RubySSLSocketFactory
-    implementation 'com.squareup.okhttp3:okhttp:4.4.1'
-    kapt 'com.github.liujingxing.rxhttp:rxhttp-compiler:2.7.3'
+    implementation 'com.squareup.okhttp3:okhttp:4.12.0'
+    ksp 'com.github.liujingxing.rxhttp:rxhttp-compiler:3.2.4'
+
 
-    implementation 'io.reactivex.rxjava3:rxjava:3.1.3'
-    implementation 'io.reactivex.rxjava3:rxandroid:3.0.0'
-    implementation 'com.github.liujingxing.rxlife:rxlife-rxjava3:2.2.1'
+    implementation 'io.reactivex.rxjava3:rxjava:3.1.8'
+    implementation 'io.reactivex.rxjava3:rxandroid:3.0.2'
+    implementation 'com.github.liujingxing.rxlife:rxlife-rxjava3:2.2.2'
 
     implementation 'xyz.zpayh:hdimageview:3.0.2'
 
     implementation project(path: ':models')
     implementation project(path: ':progressmanager')
     implementation project(path: ':flowlayout-lib')
     implementation 'com.waynejo:androidndkgif:0.3.3'
-    implementation 'com.tencent:mmkv-static:1.2.12'
+    implementation 'com.tencent:mmkv-static:1.3.3'
     implementation 'com.github.tbruyelle:rxpermissions:0.12'
 
-    implementation 'androidx.webkit:webkit:1.6.0'
+    implementation 'androidx.webkit:webkit:1.10.0'
 
     implementation 'com.hjq:toast:8.8'
 
     testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test:runner:1.4.0'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+    androidTestImplementation 'androidx.test:runner:1.5.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
 
     implementation "androidx.documentfile:documentfile:1.0.1"
     implementation 'com.billy.android:smart-swipe:1.1.2'
@@ -224,7 +227,7 @@ dependencies {
 
     implementation 'com.davemorrissey.labs:subsampling-scale-image-view-androidx:3.10.0'
 
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.2'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4'
 
     configurations {
         all*.exclude group: 'com.android.support', module: 'support-v13'

diff --git a/app/src/main/java/ceui/lisa/core/Manager.java b/app/src/main/java/ceui/lisa/core/Manager.java
@@ -34,11 +34,12 @@
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.functions.Action;
 import io.reactivex.rxjava3.functions.Consumer;
-import rxhttp.RxHttp;
 import rxhttp.wrapper.callback.UriFactory;
 import rxhttp.wrapper.entity.Progress;
+import rxhttp.wrapper.param.RxHttp;
 import rxhttp.wrapper.utils.UriUtil;
 
+
 public class Manager {
 
     private final Context mContext = Shaft.getContext();
@@ -242,6 +243,7 @@ private DownloadItem getFirstOne() {
         return null;
     }
 
+
     private void downloadOne(Context context, DownloadItem downloadItem) {
         // check network status, if setting don't download when mobile data, stop all task
         if(!DownloadLimitTypeUtil.canDownloadNow()){
@@ -265,7 +267,8 @@ private void downloadOne(Context context, DownloadItem downloadItem) {
         handle = RxHttp.get(downloadItem.getUrl())
                 .addHeader(Params.MAP_KEY, Params.IMAGE_REFERER)
                 .setRangeHeader(passSize, true)
-                .asDownload(factory, AndroidSchedulers.mainThread(), new Consumer<Progress>() {
+                .toDownloadObservable(factory, false)
+                .onMainProgress(new Consumer<Progress>() {
                     @Override
                     public void accept(Progress progress) {
                         //downloadItem.setTransferredBytes(progress.getCurrentSize());

diff --git a/app/src/main/java/ceui/lisa/fragments/FragmentIllust.kt b/app/src/main/java/ceui/lisa/fragments/FragmentIllust.kt
@@ -228,17 +228,17 @@ class FragmentIllust : SwipeFragment<FragmentIllustBinding>() {
                     .listener(object : RequestListener<Bitmap?> {
                         override fun onLoadFailed(
                             e: GlideException?,
-                            model: Any,
+                            model: Any?,
                             target: Target<Bitmap?>,
                             isFirstResource: Boolean
                         ): Boolean {
                             return false
                         }
 
                         override fun onResourceReady(
-                            resource: Bitmap?,
+                            resource: Bitmap,
                             model: Any,
-                            target: Target<Bitmap?>,
+                            target: Target<Bitmap?>?,
                             dataSource: DataSource,
                             isFirstResource: Boolean
                         ): Boolean {

diff --git a/app/src/main/java/ceui/loxia/ImageFragment.kt b/app/src/main/java/ceui/loxia/ImageFragment.kt
@@ -46,7 +46,7 @@ class ImageFragment : NavFragment(R.layout.fragment_image) {
                 }
                 progressbar.isVisible = false
                 if (bitmap != null) {
-                    image.setImage(ImageSource.bitmap(bitmap))
+                    image.setImage(ImageSource.bitmap(bitmap!!))
                 }
             }
         }

diff --git a/build.gradle b/build.gradle
@@ -2,16 +2,19 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.8.0'
+    ext {
+        agp_version = '8.2.2'
+    }
+    ext.kotlin_version = '1.9.10'
     repositories {
         google()
         mavenCentral()
         maven { url 'https://jcenter.bintray.com/' }
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:8.1.4"
-        classpath 'com.google.gms:google-services:4.3.15'
-        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.4'
+        classpath "com.android.tools.build:gradle:$agp_version"
+        classpath 'com.google.gms:google-services:4.4.1'
+        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.9'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jmailen.gradle:kotlinter-gradle:3.7.0"
 
@@ -23,8 +26,9 @@ buildscript {
 }
 
 plugins {
-    id "com.github.ben-manes.versions" version "0.41.0"
-    id 'org.jetbrains.kotlin.android' version '1.8.0' apply false
+    id "com.github.ben-manes.versions" version "0.42.0"
+    id 'org.jetbrains.kotlin.android' version '1.9.10' apply false
+    id 'com.google.devtools.ksp' version '1.9.10-1.0.13' apply false
 }
 
 allprojects {

diff --git a/flowlayout-lib/build.gradle b/flowlayout-lib/build.gradle
@@ -1,11 +1,11 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 33
+    compileSdk 34
 
     defaultConfig {
         minSdk 21
-        targetSdkVersion 33
+        targetSdk 34
     }
     buildTypes {
         release {

diff --git a/models/build.gradle b/models/build.gradle
@@ -2,11 +2,11 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 33
+    compileSdk 34
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 33
+        targetSdk 34
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles 'consumer-rules.pro'
@@ -36,9 +36,9 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'androidx.core:core-ktx:1.6.0'
+    implementation 'androidx.core:core-ktx:1.12.0'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4'
 }
 repositories {
     mavenCentral()

diff --git a/progressmanager/build.gradle b/progressmanager/build.gradle
@@ -1,11 +1,11 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 33
+    compileSdk 34
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 33
+        targetSdk 34
 
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
 
@@ -24,5 +24,5 @@ android {
 }
 
 dependencies {
-    compileOnly 'com.squareup.okhttp3:okhttp:4.4.1'
+    compileOnly 'com.squareup.okhttp3:okhttp:4.12.0'
 }