Merge branch 'androidx' of github.com:CymChad/BaseRecyclerViewAdapter…

…Helper into androidx # Conflicts: # README-cn.md
CymChad · Jul 28, 2019 · 5db07fc · 5db07fc
1 parent a388c87
commit 5db07fc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/brvahKtx/build.gradle b/brvahKtx/build.gradle
@@ -11,7 +11,7 @@ android {
         versionCode 1
         versionName "1.0"
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
     }
 
@@ -26,7 +26,7 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    compileOnly 'com.android.support:recyclerview-v7:28.0.0'
+    compileOnly 'androidx.recyclerview:recyclerview:1.0.0'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.0-RC'
     implementation project(path: ':library')

diff --git a/brvahKtx/src/main/java/com/chinakingo/brvahktx/AdapterKtx.kt b/brvahKtx/src/main/java/com/chinakingo/brvahktx/AdapterKtx.kt
@@ -1,6 +1,6 @@
 package com.chinakingo.brvahktx
 
-import android.support.v7.util.DiffUtil
+import androidx.recyclerview.widget.DiffUtil
 import com.chad.library.adapter.base.BaseQuickAdapter
 import com.chad.library.adapter.base.BaseViewHolder
 import com.chad.library.adapter.base.diff.BaseQuickDiffCallback