diff --git a/AppFrame/build.gradle b/AppFrame/build.gradle index 9f5b84fc..353956ae 100644 --- a/AppFrame/build.gradle +++ b/AppFrame/build.gradle @@ -55,24 +55,24 @@ dependencies { exclude group: 'com.android.support', module: 'support-annotations' }) - testImplementation 'junit:junit:4.12' + testImplementation 'junit:junit:4.13.2' - api "androidx.appcompat:appcompat:${rootProject.ext.XAppcompatVersion}" - api 'com.google.code.gson:gson:2.8.5' - api 'io.reactivex.rxjava3:rxjava:3.0.0' - api 'io.reactivex.rxjava3:rxandroid:3.0.0' + api "androidx.appcompat:appcompat:1.3.1" + api 'com.google.code.gson:gson:2.14.0' + api 'io.reactivex.rxjava3:rxjava:3.1.12' + api 'io.reactivex.rxjava3:rxandroid:3.0.2' implementation 'androidx.multidex:multidex:2.0.1' - implementation 'com.squareup.okhttp3:okhttp:3.10.0' - implementation 'com.squareup.okhttp3:logging-interceptor:3.10.0' - implementation 'com.squareup.retrofit2:retrofit:2.9.0' + implementation 'com.squareup.okhttp3:okhttp:4.8.1' + implementation 'com.squareup.okhttp3:logging-interceptor:4.8.1' + implementation 'com.squareup.retrofit2:retrofit:3.0.0' // implementation 'com.squareup.retrofit2:adapter-rxjava:2.9.0' - implementation 'com.squareup.retrofit2:adapter-rxjava3:2.9.0' - implementation 'com.squareup.retrofit2:converter-gson:2.9.0' + implementation 'com.squareup.retrofit2:adapter-rxjava3:3.0.0' + implementation 'com.squareup.retrofit2:converter-gson:3.0.0' implementation 'com.github.franmontiel:PersistentCookieJar:v1.0.1' - api 'androidx.lifecycle:lifecycle-runtime:2.2.0' api 'androidx.lifecycle:lifecycle-extensions:2.2.0' - kapt 'androidx.lifecycle:lifecycle-compiler:2.2.0' - + api 'androidx.lifecycle:lifecycle-runtime:2.3.1' + api 'androidx.lifecycle:lifecycle-common:2.3.1' + kapt 'androidx.lifecycle:lifecycle-compiler:2.3.1' } diff --git a/app/build.gradle b/app/build.gradle index df119e26..bebb7f1e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -81,21 +81,23 @@ dependencies { implementation 'androidx.cardview:cardview:1.0.0' - testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test:runner:1.2.0' - androidTestImplementation 'androidx.test.ext:junit:1.1.1' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test:runner:1.7.0' + androidTestImplementation 'androidx.test.ext:junit:1.3.0' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.7.0' - debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.7' + debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.14' - implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.0' implementation "org.jetbrains.kotlin:kotlin-stdlib:${rootProject.ext.kotlin_version}" + implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.11.0' - implementation 'com.google.android.material:material:1.0.0' + implementation 'com.google.android.material:material:1.2.0' + + implementation 'com.github.bumptech.glide:glide:4.13.2' + kapt 'com.github.bumptech.glide:compiler:4.13.2' - implementation 'com.github.bumptech.glide:glide:3.7.0' implementation 'com.pddstudio:highlightjs-android:1.5.0' - implementation 'org.greenrobot:eventbus:3.1.1' + implementation 'org.greenrobot:eventbus:3.3.1' implementation project(':AppFrame') // aria diff --git a/build.gradle b/build.gradle index 82ef8a1d..e41c687d 100644 --- a/build.gradle +++ b/build.gradle @@ -88,6 +88,4 @@ ext { lifecycleVersion = "1.1.1" minSdkVersion = 15 - // 以下是androidX - XAppcompatVersion = "1.1.0" }