moliparty/peko-android
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat:升级部分SDK版本

Browse Source
This commit is contained in:
Max
2023-11-27 17:03:31 +08:00
parent 4c80cda20a
commit d9c84e1ac7
9 changed files with 31 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/build.gradle
View File

@@ -211,10 +211,6 @@ def Lombok = "1.18.24"
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
implementation fileTree(dir: 'aliyun-libs', include: ['*.jar', '*.aar'])
implementation 'androidx.appcompat:appcompat:1.4.2'
implementation 'com.google.android.material:material:1.6.1'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.6.2'
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2'
@@ -236,9 +232,8 @@ dependencies {
api "com.github.zyyoona7:EasyPopup:1.0.2"
api "com.github.donkingliang:LabelsView:1.6.5"
api "com.github.yyued:SVGAPlayer-Android:2.6.1"
implementation "com.orhanobut:logger:2.2.0"
api "com.ms-square:expandableTextView:0.1.4"
annotationProcessor 'androidx.annotation:annotation:1.4.0'
annotationProcessor 'androidx.annotation:annotation:1.6.0'
implementation 'io.github.h07000223:flycoTabLayout:3.0.0'

1
app/src/main/java/com/chwl/app/ui/login/LoginActivity.java
View File

@@ -16,6 +16,7 @@ import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.core.content.ContextCompat;
import com.example.module_base.support.google.IGoogleService;
import com.netease.nim.uikit.StatusBarUtil;
import com.chwl.app.upgrade.AppUpgradeHelper;
import com.trello.rxlifecycle3.android.ActivityEvent;

2
app/src/main/java/com/chwl/app/ui/utils/ImageLoad.kt
View File

@@ -7,7 +7,7 @@ import android.content.ContextWrapper
import android.graphics.drawable.Drawable
import android.widget.ImageView
import androidx.annotation.Dimension
import androidx.annotation.Dimension.DP
import androidx.annotation.Dimension.Companion.DP
import androidx.annotation.DrawableRes
import androidx.fragment.app.FragmentActivity
import com.bumptech.glide.load.resource.bitmap.CenterCrop

3
core/build.gradle
View File

@@ -53,13 +53,12 @@ android {
}
def loggerVersion = "2.2.0"
def Lombok = "1.18.24"
dependencies {
api fileTree(dir: 'libs', include: ['*.jar'])
api "com.orhanobut:logger:${loggerVersion}"
api "com.orhanobut:logger:2.2.0"
compileOnly "org.projectlombok:lombok:${Lombok}"
annotationProcessor "org.projectlombok:lombok:${Lombok}"

48
library/build.gradle
View File

@@ -58,53 +58,39 @@ android {
}
dependencies {
def glideVersion = "4.13.2"
def retrofitVersion = "2.9.0"
def okhttp3 = "4.10.0"
def okio = "2.8.0"
def rxjava_adapter = "2.3.0"
def rxjava = "2.1.7"
def rxjava_android = "2.0.1"
def rxlifecycle = "3.1.0"
def loggerVersion = "2.2.0"
def qiniu = "8.4.4"
def SmartRefreshLayoutVersion = "1.0.3"
def eventbusVersion = "3.3.1"
def fragment_version = "1.6.1"
def GlideTransformationsVersion = "3.0.1"
implementation fileTree(dir: 'libs', include: ['*.jar'])
api 'androidx.cardview:cardview:1.0.0'
api 'androidx.gridlayout:gridlayout:1.0.0'
api "androidx.fragment:fragment:$fragment_version"
api "androidx.fragment:fragment-ktx:$fragment_version"
api "androidx.fragment:fragment:1.6.1"
api "androidx.fragment:fragment-ktx:1.6.1"
api "com.squareup.retrofit2:retrofit:${retrofitVersion}"
api "com.squareup.okhttp3:okhttp:${okhttp3}"
api "com.squareup.okhttp3:logging-interceptor:${okhttp3}"
api "com.squareup.okio:okio:${okio}"
api "com.squareup.retrofit2:retrofit:2.9.0"
api "com.squareup.okhttp3:okhttp:4.10.0"
api "com.squareup.okhttp3:logging-interceptor:4.10.0"
api "com.squareup.okio:okio:3.0.0"
api "com.squareup.retrofit2:adapter-rxjava2:${rxjava_adapter}"
api "com.squareup.retrofit2:adapter-rxjava2:2.3.0"
api 'com.google.code.gson:gson:2.9.0'
api "com.scwang.smartrefresh:SmartRefreshLayout:${SmartRefreshLayoutVersion}"
api "com.scwang.smartrefresh:SmartRefreshHeader:${SmartRefreshLayoutVersion}"
api "io.reactivex.rxjava2:rxjava:${rxjava}"
api "io.reactivex.rxjava2:rxandroid:${rxjava_android}"
api "com.trello.rxlifecycle3:rxlifecycle:${rxlifecycle}"
api "com.trello.rxlifecycle3:rxlifecycle-android:${rxlifecycle}"
api "com.trello.rxlifecycle3:rxlifecycle-components:${rxlifecycle}"
api "com.github.bumptech.glide:glide:${glideVersion}"
annotationProcessor "com.github.bumptech.glide:compiler:${glideVersion}"
api "io.reactivex.rxjava2:rxjava:2.2.12"
api "io.reactivex.rxjava2:rxandroid:2.1.1"
api "com.trello.rxlifecycle3:rxlifecycle:3.1.0"
api "com.trello.rxlifecycle3:rxlifecycle-android:3.1.0"
api "com.trello.rxlifecycle3:rxlifecycle-components:3.1.0"
api "com.github.bumptech.glide:glide:4.13.2"
annotationProcessor "com.github.bumptech.glide:compiler:4.13.2"
api "com.orhanobut:logger:${loggerVersion}"
api "com.orhanobut:logger:2.2.0"
api "com.qiniu:qiniu-android-sdk:${qiniu}"
api "org.greenrobot:eventbus:${eventbusVersion}"
api "org.greenrobot:eventbus:3.3.1"
api "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
api 'com.github.getActivity:ToastUtils:10.5'
@@ -116,7 +102,7 @@ dependencies {
//mmkv
api 'com.tencent:mmkv:1.2.13'
api "jp.wasabeef:glide-transformations:${GlideTransformationsVersion}"
api "jp.wasabeef:glide-transformations:3.0.1"
//流式布局
api 'com.google.android.flexbox:flexbox:3.0.0'

6
libs/lib_core/build.gradle
View File

@@ -9,9 +9,9 @@ dependencies {
api project(path: ":libs:lib_utils")
api 'androidx.constraintlayout:constraintlayout:2.1.4'
api 'androidx.recyclerview:recyclerview:1.2.1'
api 'com.google.android.material:material:1.6.1'
api 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.1'
api 'com.google.android.material:material:1.8.0'
api 'androidx.recyclerview:recyclerview:1.3.0'
api 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2'
api 'androidx.lifecycle:lifecycle-extensions:2.2.0'

4
libs/lib_crop/build.gradle
View File

@@ -20,9 +20,9 @@ android {
}
dependencies {
api 'androidx.annotation:annotation:1.4.0'
api 'androidx.annotation:annotation:1.6.0'
api 'androidx.legacy:legacy-support-v4:1.0.0'
implementation "androidx.core:core-ktx:1.7.0"
implementation "androidx.core:core-ktx:1.9.0"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
}
repositories {

4
libs/lib_utils/build.gradle
View File

@@ -5,6 +5,6 @@ android {
}
dependencies {
api "androidx.core:core-ktx:1.7.0"
api 'androidx.appcompat:appcompat:1.4.2'
api "androidx.core:core-ktx:1.9.0"
api 'androidx.appcompat:appcompat:1.6.1'
}

6
modules/module_base.gradle
View File

@@ -41,9 +41,9 @@ android {
}
dependencies {
implementation 'androidx.core:core-ktx:1.7.0'
implementation 'androidx.appcompat:appcompat:1.4.2'
implementation 'com.google.android.material:material:1.6.1'
implementation 'com.google.android.material:material:1.8.0'
implementation 'androidx.core:core-ktx:1.9.0'
implementation 'androidx.appcompat:appcompat:1.6.1'
// aRouter
api 'com.alibaba:arouter-api:1.4.0'