升级Jetpack依赖库

Author: fmtjava

app/build.gradle

@@ -56,50 +56,50 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     implementation project(path: ':common')
-    testImplementation 'junit:junit:4.13.1'
+    testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test:runner:1.3.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
-    implementation 'androidx.recyclerview:recyclerview:1.1.0'
-    implementation 'com.google.android.material:material:1.2.1'
+    implementation 'androidx.recyclerview:recyclerview:1.2.1'
+    implementation 'com.google.android.material:material:1.3.0'
 
     //协程
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.0'
 
     //Android KTX 是一组 Kotlin 扩展程序，属于 Android Jetpack 系列
-    implementation 'androidx.core:core-ktx:1.3.2'
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.2.0'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0'
-    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.2.0'
+    implementation 'androidx.core:core-ktx:1.5.0'
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.1'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1'
+    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.3.1'
     implementation 'com.github.fmtjava:LiveDataBus:1.0.0'
 
     //okhttp + retrofit(2.6.0以后支持协程)
-    implementation("com.squareup.okhttp3:logging-interceptor:4.0.0")
+    implementation("com.squareup.okhttp3:logging-interceptor:5.0.0-alpha.2")
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
     implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
 
     //协程 + room
-    implementation "androidx.room:room-runtime:2.2.5"
-    kapt "androidx.room:room-compiler:2.2.5"
-    implementation "androidx.room:room-ktx:2.2.5"
+    implementation "androidx.room:room-runtime:2.3.0"
+    kapt "androidx.room:room-compiler:2.3.0"
+    implementation "androidx.room:room-ktx:2.3.0"
 
     //navigation
-    implementation "androidx.navigation:navigation-fragment-ktx:2.3.1"
-    implementation "androidx.navigation:navigation-ui-ktx:2.3.1"
+    implementation "androidx.navigation:navigation-fragment-ktx:2.3.5"
+    implementation "androidx.navigation:navigation-ui-ktx:2.3.5"
 
     //paging
-    implementation "androidx.paging:paging-runtime:3.0.0-alpha09"
+    implementation "androidx.paging:paging-runtime-ktx:3.1.0-alpha01"
 
     //WorkManager
-    implementation "androidx.work:work-runtime-ktx:2.4.0"
+    implementation "androidx.work:work-runtime-ktx:2.6.0-beta01"
 
     //koin(依赖注入)
     implementation "org.koin:koin-androidx-scope:2.0.1"
     implementation "org.koin:koin-androidx-viewmodel:2.0.1"
     implementation "org.koin:koin-androidx-ext:2.0.1"
 
     //动态权限
-    implementation 'com.afollestad:assent:2.3.1'
+    implementation 'com.afollestad.assent:core:3.0.0-RC4'
 
     //第三方控件
     implementation 'de.hdodenhof:circleimageview:3.0.0'

app/src/main/AndroidManifest.xml

@@ -9,6 +9,7 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />

app/src/main/java/com/fmt/github/FlutterAppActivity.kt

@@ -6,7 +6,7 @@ import io.flutter.embedding.android.FlutterActivity
 
 class FlutterAppActivity : FlutterActivity() {
 
-    var mInitParam: String? = null
+    private var mInitParam: String? = null
 
     companion object {
         const val INIT_PARAMS = "initParams"
@@ -20,5 +20,5 @@ class FlutterAppActivity : FlutterActivity() {
 
     //设置显示Flutter对应页面的路由
     override fun getInitialRoute(): String =
-        if (mInitParam.isNullOrEmpty()) super.getInitialRoute() else mInitParam!!
+        if (mInitParam.isNullOrEmpty()) super.getInitialRoute().toString() else mInitParam!!
 }

app/src/main/java/com/fmt/github/base/fragment/BasePagingVMFragment.kt

@@ -1,6 +1,5 @@
 package com.fmt.github.base.fragment
 
-import androidx.paging.ExperimentalPagingApi
 import androidx.paging.LoadState
 import androidx.paging.PagingDataAdapter
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -22,7 +21,6 @@ abstract class BasePagingVMFragment<M : Any, VM : BaseLPagingViewModel<M>, VH :
 
     override fun getLayoutRes(): Int = R.layout.common_recyclerview
 
-    @ExperimentalPagingApi
     override fun initView() {
         mSwipeRefreshLayout.setOnRefreshListener {
             mAdapter.refresh()

app/src/main/java/com/fmt/github/base/viewmodel/BaseLPagingViewModel.kt

@@ -32,6 +32,8 @@ abstract class BaseLPagingViewModel<M : Any> : BaseViewModel() {
                 LoadResult.Error(e)
             }
         }
+
+        override fun getRefreshKey(state: PagingState<Int, M>): Int? = null
     }
 
     abstract suspend fun getDataList(page: Int): List<M>