Migrate to AndroidX, update dependencies, convert few classes to objects

build.gradle

@@ -21,20 +21,24 @@ allprojects {
     }
     project.ext {
         libraryVersion = '1.3.0'
-        supportVersion = '27.1.1'
     }
 }
 subprojects {
 
     afterEvaluate {
 
         android {
-            compileSdkVersion 27
-            buildToolsVersion '27.0.3'
+            compileSdkVersion 28
+            buildToolsVersion '28.0.2'
 
             defaultConfig {
                 minSdkVersion 19
-                targetSdkVersion 27
+                targetSdkVersion 28
+            }
+
+            compileOptions {
+                sourceCompatibility JavaVersion.VERSION_1_8
+                targetCompatibility JavaVersion.VERSION_1_8
             }
         }
     }

gradle.properties

@@ -9,6 +9,8 @@
 
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
+android.enableJetifier=true
+android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1536m
 
 # When configured, Gradle will run in incubating parallel mode.

multiviewadapter-kt-extensions/build.gradle

@@ -13,8 +13,8 @@ androidExtensions {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    implementation "com.android.support:appcompat-v7:$supportVersion"
-    implementation "com.android.support:recyclerview-v7:$supportVersion"
+    implementation 'androidx.appcompat:appcompat:1.0.0'
+    implementation 'androidx.recyclerview:recyclerview:1.0.0'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
     implementation project(path: ':multiviewadapter')
 }

multiviewadapter/build.gradle

@@ -7,8 +7,8 @@ apply from: '../bintray/bintray.gradle'
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation "com.android.support:appcompat-v7:$supportVersion"
-    implementation "com.android.support:recyclerview-v7:$supportVersion"
+    implementation 'androidx.appcompat:appcompat:1.0.0'
+    implementation 'androidx.recyclerview:recyclerview:1.0.0'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
 
     testImplementation 'junit:junit:4.12'

multiviewadapter/src/main/java/serg/chuprin/adapter/DiffMultiViewAdapter.kt

@@ -1,9 +1,9 @@
 package serg.chuprin.adapter
 
-import android.support.v7.recyclerview.extensions.AsyncDifferConfig
-import android.support.v7.recyclerview.extensions.AsyncListDiffer
-import android.support.v7.util.AdapterListUpdateCallback
-import android.support.v7.util.DiffUtil
+import androidx.recyclerview.widget.AdapterListUpdateCallback
+import androidx.recyclerview.widget.AsyncDifferConfig
+import androidx.recyclerview.widget.AsyncListDiffer
+import androidx.recyclerview.widget.DiffUtil
 import serg.chuprin.adapter.base.AbsMultiViewAdapter
 
 @Suppress("unused")

multiviewadapter/src/main/java/serg/chuprin/adapter/RendererDelegate.kt

@@ -1,6 +1,6 @@
 package serg.chuprin.adapter
 
-import android.support.v4.util.SparseArrayCompat
+import androidx.collection.SparseArrayCompat
 
 @Suppress("UNCHECKED_CAST")
 class RendererDelegate<T : Any> {

multiviewadapter/src/main/java/serg/chuprin/adapter/ViewHolder.kt

@@ -1,7 +1,7 @@
 package serg.chuprin.adapter
 
-import android.support.v7.widget.RecyclerView
 import android.view.View
+import androidx.recyclerview.widget.RecyclerView
 
 typealias Click = ViewHolder.ClickCallback
 typealias LongClick = ViewHolder.LongClickCallback

multiviewadapter/src/main/java/serg/chuprin/adapter/ViewRenderer.kt

@@ -1,9 +1,9 @@
 package serg.chuprin.adapter
 
-import android.support.annotation.LayoutRes
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.annotation.LayoutRes
 
 @Suppress("UNCHECKED_CAST")
 abstract class ViewRenderer<in M : Any, VH : ViewHolder> {

multiviewadapter/src/main/java/serg/chuprin/adapter/base/AbsMultiViewAdapter.kt

@@ -1,15 +1,16 @@
 package serg.chuprin.adapter.base
 
-import android.support.v7.widget.RecyclerView
 import android.view.View
 import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
 import serg.chuprin.adapter.R
 import serg.chuprin.adapter.RendererDelegate
 import serg.chuprin.adapter.ViewHolder
 import serg.chuprin.adapter.ViewRenderer
 
 @Suppress("unused", "MemberVisibilityCanBePrivate")
-abstract class AbsMultiViewAdapter<T : Any> : RecyclerView.Adapter<ViewHolder>(),
+abstract class AbsMultiViewAdapter<T : Any> :
+    RecyclerView.Adapter<ViewHolder>(),
     ViewHolder.ClickCallback,
     ViewHolder.LongClickCallback {
 

sample/build.gradle

@@ -14,12 +14,12 @@ androidExtensions {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation "com.android.support:appcompat-v7:$supportVersion"
-    implementation "com.android.support:recyclerview-v7:$supportVersion"
-    implementation "io.reactivex.rxjava2:rxjava:2.1.10"
-    implementation 'io.reactivex.rxjava2:rxandroid:2.0.1'
+    implementation 'androidx.appcompat:appcompat:1.0.0'
+    implementation 'androidx.recyclerview:recyclerview:1.0.0'
+    implementation "io.reactivex.rxjava2:rxjava:2.2.0"
+    implementation 'io.reactivex.rxjava2:rxandroid:2.1.0'
     implementation 'com.github.bumptech.glide:glide:3.8.0'
-    implementation 'com.jakewharton.rxbinding2:rxbinding-recyclerview-v7-kotlin:2.0.0'
+    implementation 'com.jakewharton.rxbinding2:rxbinding-recyclerview-v7-kotlin:2.2.0'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
     implementation project(path: ':multiviewadapter')
     implementation project(path: ':multiviewadapter-kt-extensions')

sample/src/main/java/serg/chuprin/multiviewadapter/diff/DiffActivity.kt

@@ -1,9 +1,9 @@
 package serg.chuprin.multiviewadapter.diff
 
 import android.os.Bundle
-import android.support.v7.app.AppCompatActivity
-import android.support.v7.util.DiffUtil
-import android.support.v7.widget.LinearLayoutManager
+import androidx.appcompat.app.AppCompatActivity
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.LinearLayoutManager
 import io.reactivex.Single
 import io.reactivex.disposables.CompositeDisposable
 import kotlinx.android.synthetic.main.activity_diff.*

sample/src/main/java/serg/chuprin/multiviewadapter/view/MainActivity.kt

@@ -1,9 +1,9 @@
 package serg.chuprin.multiviewadapter.view
 
 import android.os.Bundle
-import android.support.v7.app.AppCompatActivity
-import android.support.v7.widget.LinearLayoutManager
-import android.support.v7.widget.RecyclerView
+import androidx.appcompat.app.AppCompatActivity
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 import com.jakewharton.rxbinding2.support.v7.widget.RecyclerViewScrollEvent
 import com.jakewharton.rxbinding2.support.v7.widget.RxRecyclerView
 import io.reactivex.Observable
@@ -61,7 +61,8 @@ fun RecyclerView.paginate(): Observable<ScrollEvent> {
         .startWith(RecyclerViewScrollEvent.create(this, 0, 0))
         .distinctUntilChanged { t1, t2 -> t1.dy() == t2.dy() }
         .map {
-            val pos = (layoutManager as LinearLayoutManager).findLastVisibleItemPosition()
+            val pos =
+                (layoutManager as androidx.recyclerview.widget.LinearLayoutManager).findLastVisibleItemPosition()
             ScrollEvent(pos, adapter?.itemCount ?: 0)
         }
 }

sample/src/main/java/serg/chuprin/multiviewadapter/view/adapter/NetworkErrorModel.kt

@@ -1,3 +1,3 @@
 package serg.chuprin.multiviewadapter.view.adapter
 
-class NetworkErrorModel
+object NetworkErrorModel

sample/src/main/java/serg/chuprin/multiviewadapter/view/adapter/PaginationAdapter.kt

@@ -6,14 +6,14 @@ class PaginationAdapter : MultiViewAdapter() {
 
     fun setLoadingMoreVisibility(visible: Boolean) {
         return when (visible) {
-            true -> addItemIfNotPresent(ProgressModel())
+            true -> addItemIfNotPresent(ProgressModel)
             false -> removeLast(ProgressModel::class.java)
         }
     }
 
     fun setNetworkErrorVisibility(visible: Boolean) {
         return when (visible) {
-            true -> addItemIfNotPresent(NetworkErrorModel())
+            true -> addItemIfNotPresent(NetworkErrorModel)
             false -> removeLast(NetworkErrorModel::class.java)
         }
     }

sample/src/main/java/serg/chuprin/multiviewadapter/view/adapter/ProgressModel.kt

@@ -1,3 +1,3 @@
 package serg.chuprin.multiviewadapter.view.adapter
 
-class ProgressModel
+object ProgressModel

sample/src/main/res/layout/activity_diff.xml

@@ -37,7 +37,7 @@
             android:textColor="?colorAccent" />
     </LinearLayout>
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recyclerView"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />

sample/src/main/res/layout/activity_main.xml

@@ -6,7 +6,7 @@
     android:layout_height="match_parent"
     tools:context="serg.chuprin.multiviewadapter.view.MainActivity">
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recyclerView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"/>