diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index c66872aca..0ba04f23e 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -54,7 +54,7 @@ jobs: dependencies-cache-enabled: true configuration-cache-enabled: true - - name: Upload artifact + - name: Upload debug artifact uses: actions/upload-artifact@v4 if: ${{ !github.head_ref }} with: diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml deleted file mode 100644 index 88ea3aa1e..000000000 --- a/.idea/codeStyles/Project.xml +++ /dev/null @@ -1,122 +0,0 @@ - - - - - - - - - -
- - - - xmlns:android - - ^$ - - - -
-
- - - - xmlns:.* - - ^$ - - - BY_NAME - -
-
- - - - .*:id - - http://schemas.android.com/apk/res/android - - - -
-
- - - - .*:name - - http://schemas.android.com/apk/res/android - - - -
-
- - - - name - - ^$ - - - -
-
- - - - style - - ^$ - - - -
-
- - - - .* - - ^$ - - - BY_NAME - -
-
- - - - .* - - http://schemas.android.com/apk/res/android - - - ANDROID_ATTRIBUTE_ORDER - -
-
- - - - .* - - .* - - - BY_NAME - -
- - - - - - - \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml deleted file mode 100644 index 4e09c98c0..000000000 --- a/.idea/gradle.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1ddfb..000000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index ea09363cd..be63c9c38 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,12 +8,19 @@ apply plugin: 'org.jmailen.kotlinter' apply plugin: 'androidx.navigation.safeargs.kotlin' android { - compileSdk 34 + compileSdk 35 + splits { + abi { + enable true + reset() + include("arm64-v8a", "x86_64") + } + } defaultConfig { applicationId "ceui.lisa.pixiv" - minSdkVersion 21 + minSdk 23 targetSdkVersion 34 versionCode 328 versionName "4.2.4" @@ -25,7 +32,7 @@ android { //必须，告知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_rxjava : '3.1.9', rxhttp_package: 'rxhttp' //非必须，指定RxHttp类包名 ] } @@ -99,19 +106,17 @@ dependencies { implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version" implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version" - - //=============== Navigation def nav_version = "2.8.5" implementation "androidx.navigation:navigation-fragment-ktx:$nav_version" implementation "androidx.navigation:navigation-ui-ktx:$nav_version" implementation "org.jetbrains.kotlin:kotlin-stdlib:1.9.25" - implementation "androidx.core:core-ktx:1.13.1" + implementation "androidx.core:core-ktx:1.15.0" api 'com.squareup.retrofit2:retrofit:2.11.0' api 'com.squareup.retrofit2:converter-gson:2.11.0' - api 'com.squareup.retrofit2:adapter-rxjava2:2.9.0' + api 'com.squareup.retrofit2:adapter-rxjava2:2.11.0' api 'io.reactivex.rxjava2:rxjava:2.2.21' api 'io.reactivex.rxjava2:rxandroid:2.1.1' @@ -124,14 +129,14 @@ dependencies { implementation 'com.github.bumptech.glide:okhttp3-integration:4.16.0' kapt 'com.github.bumptech.glide:compiler:4.16.0' - implementation 'com.github.lzyzsd:circleprogress:1.2.1' + implementation 'com.github.lzyzsd:circleprogress:1.2.4' def refresh_version = "2.1.0" - implementation "io.github.scwang90:refresh-layout-kernel:$refresh_version" //核心必须依赖 - implementation "io.github.scwang90:refresh-header-classics:$refresh_version" //经典刷新头 - implementation "io.github.scwang90:refresh-header-falsify:$refresh_version" //虚拟刷新头 - implementation "io.github.scwang90:refresh-header-material:$refresh_version" //谷歌刷新头 - implementation "io.github.scwang90:refresh-footer-classics:$refresh_version" //经典加载 + implementation "io.github.scwang90:refresh-layout-kernel:$refresh_version" //核心必须依赖 + implementation "io.github.scwang90:refresh-header-classics:$refresh_version" //经典刷新头 + implementation "io.github.scwang90:refresh-header-falsify:$refresh_version" //虚拟刷新头 + implementation "io.github.scwang90:refresh-header-material:$refresh_version" //谷歌刷新头 + implementation "io.github.scwang90:refresh-footer-classics:$refresh_version" //经典加载 // okhttp3系列组件版本最高到 4.4.1，参看 RubySSLSocketFactory implementation 'com.squareup.okhttp3:logging-interceptor:4.4.1' @@ -144,19 +149,19 @@ dependencies { 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("org.sufficientlysecure:html-textview:3.9") + implementation("org.sufficientlysecure:html-textview:4.0") 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.github.skydoves:transformationlayout:1.1.4' implementation 'com.blankj:utilcodex:1.31.1' implementation 'com.safframework.log:saf-logginginterceptor:1.6.0' implementation 'com.google.firebase:firebase-analytics:22.1.2' - implementation 'com.google.firebase:firebase-crashlytics:19.2.1' + implementation 'com.google.firebase:firebase-crashlytics:19.3.0' implementation 'com.afollestad:drag-select-recyclerview:2.4.0' @@ -168,7 +173,7 @@ dependencies { implementation 'com.effective.android:panelSwitchHelper-androidx:1.3.13' implementation 'com.makeramen:roundedimageview:2.3.0' - implementation 'io.github.csdn-mobile:RoundView:1.8.0' + implementation 'io.github.csdn-mobile:RoundView:1.8.1' implementation 'com.github.liujingxing.rxhttp:rxhttp:2.7.3' @@ -176,11 +181,11 @@ dependencies { implementation 'com.squareup.okhttp3:okhttp:4.4.1' kapt 'com.github.liujingxing.rxhttp:rxhttp-compiler:2.7.3' - 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.9' + implementation 'io.reactivex.rxjava3:rxandroid:3.0.2' + implementation 'com.github.liujingxing.rxlife:rxlife-rxjava3:2.2.2' - def lottieVersion = "3.4.1" + def lottieVersion = "6.6.2" implementation "com.airbnb.android:lottie:$lottieVersion" implementation 'xyz.zpayh:hdimageview:3.0.2' @@ -189,7 +194,7 @@ dependencies { implementation project(path: ':progressmanager') implementation project(path: ':flowlayout-lib') implementation 'com.waynejo:androidndkgif:0.3.3' - implementation 'com.tencent:mmkv-static:1.3.9' + implementation 'com.tencent:mmkv-static:2.0.2' implementation 'com.github.tbruyelle:rxpermissions:0.12' implementation 'androidx.webkit:webkit:1.12.1' @@ -210,9 +215,9 @@ dependencies { implementation("io.github.panpf.zoomimage:zoomimage-view-sketch4:1.1.0-rc03") - implementation("me.zhanghai.android.fastscroll:library:1.2.0") + implementation("me.zhanghai.android.fastscroll:library:1.3.0") - coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.3' + coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.4' configurations { all*.exclude group: 'com.android.support', module: 'support-v13' diff --git a/build.gradle b/build.gradle index fd29878af..995faa6bc 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,6 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.13.0' repositories { maven { url "https://jitpack.io" } maven { url "https://repository.jboss.org/maven2" } @@ -18,7 +17,7 @@ buildscript { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.25" classpath 'com.google.gms:google-services:4.4.2' classpath 'com.google.firebase:firebase-crashlytics-gradle:3.0.2' - classpath "org.jmailen.gradle:kotlinter-gradle:3.7.0" + classpath "org.jmailen.gradle:kotlinter-gradle:5.0.1" def nav_version = '2.8.5' classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$nav_version" @@ -48,6 +47,6 @@ allprojects { } } -task clean(type: Delete) { - delete rootProject.buildDir +tasks.register('clean', Delete) { + delete rootProject.getLayout().getBuildDirectory() } diff --git a/flowlayout-lib/build.gradle b/flowlayout-lib/build.gradle index 58140e1fc..3bda3fdad 100644 --- a/flowlayout-lib/build.gradle +++ b/flowlayout-lib/build.gradle @@ -1,11 +1,11 @@ apply plugin: 'com.android.library' android { - compileSdk 34 + compileSdk 35 defaultConfig { - minSdkVersion 21 - targetSdkVersion 34 + minSdk 23 + targetSdkVersion 35 } buildTypes { release { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9cba351b1..b8a83ab7d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Sun Jul 28 19:06:18 CST 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/models/build.gradle b/models/build.gradle index 76a6487ee..101fedbeb 100644 --- a/models/build.gradle +++ b/models/build.gradle @@ -2,11 +2,11 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' android { - compileSdk 34 + compileSdk 35 defaultConfig { - minSdkVersion 21 - targetSdkVersion 34 + minSdk 23 + targetSdkVersion 35 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles 'consumer-rules.pro' @@ -29,8 +29,8 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'androidx.core:core-ktx:1.6.0' - coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5' + implementation 'androidx.core:core-ktx:1.15.0' + coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.4' } repositories { mavenCentral() diff --git a/processor/build.gradle.kts b/processor/build.gradle.kts index 4d8f2de84..5a5797377 100644 --- a/processor/build.gradle.kts +++ b/processor/build.gradle.kts @@ -13,8 +13,6 @@ dependencies { kapt(project(":annotations")) compileOnly(project(":annotations")) - kapt ("com.google.auto.service:auto-service:1.0") - implementation ("com.google.auto.service:auto-service:1.0") - - -} \ No newline at end of file + kapt("com.google.auto.service:auto-service:1.1.1") + implementation("com.google.auto.service:auto-service:1.1.1") +} diff --git a/progressmanager/build.gradle b/progressmanager/build.gradle index 623cd7723..be2248f66 100644 --- a/progressmanager/build.gradle +++ b/progressmanager/build.gradle @@ -1,11 +1,11 @@ apply plugin: 'com.android.library' android { - compileSdk 34 + compileSdk 35 defaultConfig { - minSdkVersion 21 - targetSdkVersion 34 + minSdkVersion 23 + targetSdkVersion 35 testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'