升级Kotlin、Paging3

Author: fmtjava

app/build.gradle

@@ -54,19 +54,19 @@ dependencies {
     implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     //Androidx
     implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.1'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.2'
     testImplementation 'junit:junit:4.13'
     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 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.7'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.7'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9'
 
     //Android KTX 是一组 Kotlin 扩展程序，属于 Android Jetpack 系列
-    implementation 'androidx.core:core-ktx:1.3.1'
+    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'
@@ -87,7 +87,7 @@ dependencies {
     implementation "androidx.navigation:navigation-ui-ktx:2.3.0"
 
     //paging
-    implementation "androidx.paging:paging-runtime:3.0.0-alpha06"
+    implementation "androidx.paging:paging-runtime:3.0.0-alpha07"
 
     //WorkManager
     implementation "androidx.work:work-runtime-ktx:2.4.0"

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

@@ -1,6 +1,5 @@
 package com.fmt.github.base.fragment
 
-import androidx.lifecycle.Observer
 import androidx.paging.ExperimentalPagingApi
 import androidx.paging.LoadState
 import androidx.paging.PagingDataAdapter
@@ -38,16 +37,13 @@ abstract class BasePagingVMFragment<M : Any, VM : BaseLPagingViewModel<M>, VH :
                 is LoadState.Error -> mSwipeRefreshLayout.isRefreshing = false
             }
         }
-        mAdapter.addDataRefreshListener {
-            mSwipeRefreshLayout.isRefreshing = false
-        }
 
         mViewModel = getViewModel() as VM
         afterViewCreated()
     }
 
     override fun initData() {
-        mViewModel.pagedList.observe(this, Observer {
+        mViewModel.pagedList.observe(this, {
             mAdapter.submitData(lifecycle, it)
         })
     }

build.gradle

@@ -1,13 +1,13 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = '1.3.72'
+    ext.kotlin_version = '1.4.10'
     repositories {
         google()
         jcenter()
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.2'
+        classpath 'com.android.tools.build:gradle:4.0.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Mon Jul 15 21:18:50 CST 2019
+#Tue Oct 13 14:12:49 CST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip