modify the whole project to use the latest android studio canary 4.2,…

…material components and dagger 2.28.3

app/build.gradle

@@ -1,75 +1,77 @@
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
-apply plugin: 'kotlin-kapt'
+plugins {
+    id 'com.android.application'
+    id 'kotlin-android'
+    id 'kotlin-kapt'
+}
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 30
     defaultConfig {
         applicationId "com.android.artgallery"
-        minSdkVersion 15
-        targetSdkVersion 28
+        minSdkVersion 21
+        targetSdkVersion 30
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled = true
         vectorDrawables.useSupportLibrary = true
-        dataBinding {
-            enabled = true
-        }
+    }
+    buildFeatures {
+        viewBinding true
     }
     buildTypes {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    android.buildFeatures.dataBinding = true
 
-    testOptions{
-        unitTests{
+    testOptions {
+        unitTests {
             includeAndroidResources = true
         }
     }
-}
-
-androidExtensions{
-    experimental = true
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
 }
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'com.android.support:appcompat-v7:28.0.0'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
-    implementation 'com.android.support:support-v4:28.0.0'
-    implementation 'com.android.support:recyclerview-v7:28.0.0'
-    implementation 'com.squareup.retrofit2:retrofit:2.5.0'
-    implementation 'com.squareup.retrofit2:converter-moshi:2.5.0'
-    implementation 'com.squareup.retrofit2:converter-gson:2.4.0'
-    implementation 'com.squareup.okhttp3:okhttp:3.12.1'
-    implementation 'com.google.code.gson:gson:2.8.2'
-    implementation 'com.squareup.okhttp3:logging-interceptor:3.12.1'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'com.google.android.material:material:1.2.1'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    implementation 'com.squareup.retrofit2:retrofit:2.9.0'
+    implementation 'com.squareup.retrofit2:converter-moshi:2.8.1'
+    implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
+    implementation 'com.squareup.okhttp3:okhttp:4.8.1'
+    implementation 'com.google.code.gson:gson:2.8.6'
+    implementation 'com.squareup.okhttp3:logging-interceptor:4.8.1'
     implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
-    implementation 'io.reactivex.rxjava2:rxjava:2.2.6'
+    implementation 'io.reactivex.rxjava2:rxjava:2.2.9'
     implementation "com.squareup.retrofit2:adapter-rxjava2:2.5.0"
     implementation "org.jetbrains.anko:anko:$anko_version"
-    implementation 'com.android.support:cardview-v7:28.0.0'
-    implementation "android.arch.persistence.room:runtime:$room_version"
-    implementation "android.arch.persistence.room:rxjava2:$room_version"
-    kapt "android.arch.persistence.room:compiler:$room_version"
+    implementation 'androidx.room:room-runtime:2.2.5'
+    implementation 'androidx.room:room-rxjava2:2.2.5'
+    implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
+    kapt 'androidx.room:room-compiler:2.2.5'
     implementation "com.google.dagger:dagger:$daggerLibVersion"
     kapt "com.google.dagger:dagger-compiler:$daggerLibVersion"
     implementation "com.google.dagger:dagger-android:$daggerAndroidLibVersion"
     implementation "com.google.dagger:dagger-android-support:$daggerAndroidLibVersion"
     kapt "com.google.dagger:dagger-android-processor:$daggerLibVersion"
-    implementation "android.arch.lifecycle:extensions:1.1.1"
-    kapt "android.arch.lifecycle:compiler:1.1.1"
+//    implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
+//    kapt 'androidx.lifecycle:lifecycle-compiler:2.2.0'
     implementation 'com.squareup.picasso:picasso:2.71828'
-    implementation 'com.android.support:design:28.0.0'
-    implementation 'com.android.support:multidex:1.0.3'
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
-    androidTestImplementation 'androidx.test:runner:1.1.1'
-    androidTestImplementation 'androidx.test:rules:1.1.1'
+    implementation 'androidx.multidex:multidex:2.0.1'
+    testImplementation 'junit:junit:4.13.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+    androidTestImplementation 'androidx.test:runner:1.3.0'
+    androidTestImplementation 'androidx.test:rules:1.3.0'
     implementation("io.coil-kt:coil:0.7.0")
 }

app/src/androidTest/java/com/android/artgallery/data/PhotoDaoTest.kt

@@ -1,6 +1,6 @@
 package com.android.artgallery.data
 
-import android.arch.persistence.room.Room
+import androidx.room.Room
 import androidx.test.InstrumentationRegistry
 import androidx.test.runner.AndroidJUnit4
 import com.android.artgallery.data.source.local.AppDatabase

app/src/main/java/com/android/artgallery/MainApplication.kt

@@ -3,20 +3,21 @@ package com.android.artgallery
 import android.app.Activity
 import android.app.Application
 import android.content.Context
-import android.support.multidex.MultiDex
+import androidx.multidex.MultiDex
 import com.android.artgallery.di.component.DaggerApplicationComponent
+import dagger.android.AndroidInjector
 import dagger.android.DispatchingAndroidInjector
-import dagger.android.HasActivityInjector
+import dagger.android.HasAndroidInjector
 import javax.inject.Inject
 import kotlin.properties.Delegates
 
 
 
-class MainApplication : Application(), HasActivityInjector {
+class MainApplication : Application(),HasAndroidInjector{
 
     private val TAG = MainApplication::class.java.name
     @Inject
-    lateinit var activityInjector: DispatchingAndroidInjector<Activity>
+    lateinit var activityInjector: DispatchingAndroidInjector<Any>
 
     override fun onCreate() {
         super.onCreate()
@@ -28,8 +29,6 @@ class MainApplication : Application(), HasActivityInjector {
             .inject(this)
     }
 
-    override fun activityInjector() = activityInjector
-
 
     override fun attachBaseContext(base: Context) {
         super.attachBaseContext(base)
@@ -41,4 +40,7 @@ class MainApplication : Application(), HasActivityInjector {
         var instance: MainApplication by Delegates.notNull()
     }
 
+    override fun androidInjector(): AndroidInjector<Any>  =
+        activityInjector
+
 }

app/src/main/java/com/android/artgallery/data/source/local/AppDatabase.kt

@@ -1,7 +1,7 @@
 package com.android.artgallery.data.source.local
 
-import android.arch.persistence.room.Database
-import android.arch.persistence.room.RoomDatabase
+import androidx.room.Database
+import androidx.room.RoomDatabase
 import com.android.artgallery.data.source.local.dao.PhotoDao
 import com.android.artgallery.domain.model.Photo
 

app/src/main/java/com/android/artgallery/data/source/local/dao/PhotoDao.kt

@@ -1,7 +1,7 @@
 package com.android.artgallery.data.source.local.dao
 
 
-import android.arch.persistence.room.*
+import androidx.room.*
 import com.android.artgallery.domain.model.Photo
 
 /**

app/src/main/java/com/android/artgallery/di/ViewModelKey.kt

@@ -1,6 +1,6 @@
 package com.android.artgallery.di
 
-import android.arch.lifecycle.ViewModel
+import androidx.lifecycle.ViewModel
 import dagger.MapKey
 import kotlin.reflect.KClass
 

app/src/main/java/com/android/artgallery/di/builder/ViewModelFactoryBuilder.kt

@@ -1,6 +1,6 @@
 package com.android.artgallery.di.builder
 
-import android.arch.lifecycle.ViewModelProvider
+import androidx.lifecycle.ViewModelProvider
 import com.android.artgallery.presentation.ViewModelFactory
 import dagger.Binds
 import dagger.Module

app/src/main/java/com/android/artgallery/di/builder/ViewModelsBuilder.kt

@@ -1,6 +1,6 @@
 package com.android.artgallery.di.builder
 
-import android.arch.lifecycle.ViewModel
+import androidx.lifecycle.ViewModel
 import com.android.artgallery.di.ViewModelKey
 import com.android.artgallery.presentation.album.AlbumsViewModel
 import com.android.artgallery.presentation.detailphoto.PhotoDetailViewModel

app/src/main/java/com/android/artgallery/di/module/DatabaseModule.kt

@@ -1,7 +1,7 @@
 package com.android.artgallery.di.module
 
 import dagger.Provides
-import android.arch.persistence.room.Room
+import androidx.room.Room
 import android.app.Application
 import com.android.artgallery.data.source.local.AppDatabase
 import com.android.artgallery.data.source.local.dao.PhotoDao

app/src/main/java/com/android/artgallery/domain/model/Photo.kt

@@ -1,7 +1,7 @@
 package com.android.artgallery.domain.model
 
-import android.arch.persistence.room.Entity
-import android.arch.persistence.room.PrimaryKey
+import androidx.room.Entity
+import androidx.room.PrimaryKey
 
 @Entity(tableName = "Photo")
 data class Photo(

app/src/main/java/com/android/artgallery/presentation/ViewModelFactory.kt

@@ -1,7 +1,7 @@
 package com.android.artgallery.presentation
 
-import android.arch.lifecycle.ViewModel
-import android.arch.lifecycle.ViewModelProvider
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
 import javax.inject.Inject
 import javax.inject.Provider
 import javax.inject.Singleton

app/src/main/java/com/android/artgallery/presentation/album/AlbumViewModel.kt

@@ -1,6 +1,6 @@
 package com.android.artgallery.presentation.album
 
-import android.arch.lifecycle.MutableLiveData
+import androidx.lifecycle.MutableLiveData
 import com.android.artgallery.domain.model.Album
 
 /**A helper class for the UI controller that is responsible for

app/src/main/java/com/android/artgallery/presentation/album/AlbumsAdapter.kt

@@ -1,10 +1,10 @@
 package com.android.artgallery.presentation.album
 
-import android.databinding.DataBindingUtil
-import android.databinding.ViewDataBinding
-import android.support.v7.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.ViewGroup
+import androidx.databinding.DataBindingUtil
+import androidx.databinding.ViewDataBinding
+import androidx.recyclerview.widget.RecyclerView
 import com.android.artgallery.R
 import com.android.artgallery.databinding.HolderAlbumBinding
 import com.android.artgallery.domain.model.Album