Update to android x

app/build.gradle

@@ -5,15 +5,18 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
 apply plugin: 'kotlin-kapt'
+
+apply plugin: "androidx.navigation.safeargs"
+
 android {
-    compileSdkVersion 'android-P'
+    compileSdkVersion 28
     defaultConfig {
         applicationId "com.levimoreira.teammenagerapp"
         minSdkVersion 21
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
         release {
@@ -24,37 +27,35 @@ android {
 }
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-    def room_version = "1.1.0"
-    def lifecycle_version = "1.1.1"
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    def room_version = '2.0.0-beta01'
+    def lifecycle_version = '2.0.0-beta01'
     def dagger = "2.16"
+    def nav_version = "1.0.0-rc01"
     // ViewModel and LiveData
-    implementation "android.arch.lifecycle:extensions:$lifecycle_version"
-    implementation "android.arch.lifecycle:reactivestreams:$lifecycle_version"
-    kapt "android.arch.lifecycle:compiler:$lifecycle_version"
-
+    implementation "androidx.lifecycle:lifecycle-extensions:$lifecycle_version"
+    implementation "androidx.lifecycle:lifecycle-reactivestreams:$lifecycle_version"
+    kapt "androidx.lifecycle:lifecycle-compiler:$lifecycle_version"
     //rx
     implementation 'io.reactivex.rxjava2:rxandroid:2.0.2'
-    implementation 'io.reactivex.rxjava2:rxjava:2.1.14-RC1'
-
+    implementation 'io.reactivex.rxjava2:rxjava:2.1.14'
     //dagger
     implementation "com.google.dagger:dagger:$dagger"
     implementation "com.google.dagger:dagger-android-support:$dagger"
     kapt "com.google.dagger:dagger-compiler:$dagger"
     kapt "com.google.dagger:dagger-android-processor:$dagger"
-
-    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:$room_version"
+    implementation "androidx.room:room-rxjava2:$room_version"
+    kapt "androidx.room:room-compiler:$room_version"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-
-    implementation 'com.android.support:appcompat-v7:28.0.0-alpha1'
-    implementation 'com.android.support:design:28.0.0-alpha1'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.0'
-    implementation 'com.android.support:support-v4:28.0.0-alpha1'
+    implementation 'androidx.appcompat:appcompat:1.0.0-beta01'
+    implementation 'com.google.android.material:material:1.0.0-beta01'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.2'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0-beta01'
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
-    implementation 'android.arch.navigation:navigation-fragment-ktx:1.0.0-alpha01'
-    implementation "android.arch.navigation:navigation-ui-ktx:1.0.0-alpha01" // use -ktx for Kotlin
+    androidTestImplementation 'androidx.test:runner:1.1.0-alpha4'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0-alpha4'
+    implementation "android.arch.navigation:navigation-fragment:$nav_version" // For Kotlin use navigation-fragment-ktx
+    implementation "android.arch.navigation:navigation-ui:$nav_version"
+    // use -ktx for Kotlin
 }

app/src/androidTest/java/com/levimoreira/teammenagerapp/ExampleInstrumentedTest.kt

@@ -1,7 +1,7 @@
 package com.levimoreira.teammenagerapp
 
-import android.support.test.InstrumentationRegistry
-import android.support.test.runner.AndroidJUnit4
+import androidx.test.InstrumentationRegistry
+import androidx.test.runner.AndroidJUnit4
 
 import org.junit.Test
 import org.junit.runner.RunWith

app/src/main/java/com/levimoreira/teammenagerapp/application/TeamManagerApplication.kt

@@ -2,7 +2,7 @@ package com.levimoreira.teammenagerapp.application
 
 import android.app.Activity
 import android.app.Application
-import android.support.v4.app.Fragment
+import androidx.fragment.app.Fragment
 import com.levimoreira.teammenagerapp.application.di.DaggerApplicationComponent
 import dagger.android.AndroidInjector
 import dagger.android.DispatchingAndroidInjector
@@ -19,7 +19,7 @@ class TeamManagerApplication : Application(), HasSupportFragmentInjector {
     lateinit var activityDispatchingAndroidInjector: DispatchingAndroidInjector<Activity>
 
     @Inject
-    lateinit var supportFragmentDispatchingAndroidInjector: DispatchingAndroidInjector<Fragment>
+    lateinit var supportFragmentDispatchingAndroidInjector: DispatchingAndroidInjector<androidx.fragment.app.Fragment>
 
     private fun initDagger() {
         DaggerApplicationComponent
@@ -33,7 +33,7 @@ class TeamManagerApplication : Application(), HasSupportFragmentInjector {
         return activityDispatchingAndroidInjector
     }
 
-    override fun supportFragmentInjector(): AndroidInjector<Fragment> {
+    override fun supportFragmentInjector(): AndroidInjector<androidx.fragment.app.Fragment> {
         return supportFragmentDispatchingAndroidInjector
     }
 }

app/src/main/java/com/levimoreira/teammenagerapp/application/data/AppDatabase.kt

@@ -1,15 +1,16 @@
 package com.levimoreira.teammenagerapp.application.data
 
-import android.arch.persistence.room.Database
-import android.arch.persistence.room.RoomDatabase
+import androidx.room.Database
+import androidx.room.RoomDatabase
 import com.levimoreira.teammenagerapp.application.entities.Business
+import com.levimoreira.teammenagerapp.application.entities.BusinessPerson
 import com.levimoreira.teammenagerapp.application.entities.Organization
 import com.levimoreira.teammenagerapp.application.entities.Person
 import com.levimoreira.teammenagerapp.business.data.BusinessDao
 import com.levimoreira.teammenagerapp.organization.data.OrganizationDao
 import com.levimoreira.teammenagerapp.person.data.PersonDao
 
-@Database(entities = [(Person::class), (Organization::class), (Business::class)], version = 3)
+@Database(entities = [(Person::class), (Organization::class), (Business::class), (BusinessPerson::class)], version = 3)
 abstract class AppDatabase : RoomDatabase() {
     abstract fun personDao(): PersonDao
     abstract fun organizationDao(): OrganizationDao

app/src/main/java/com/levimoreira/teammenagerapp/application/di/DaggerViewModelFactory.kt

@@ -1,7 +1,7 @@
 package com.levimoreira.teammenagerapp.application.di
 
-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/levimoreira/teammenagerapp/application/di/DaggerViewModelFactoryModule.kt

@@ -1,6 +1,6 @@
 package com.levimoreira.teammenagerapp.application.di
 
-import android.arch.lifecycle.ViewModelProvider
+import androidx.lifecycle.ViewModelProvider
 import dagger.Binds
 import dagger.Module
 

app/src/main/java/com/levimoreira/teammenagerapp/application/di/RoomModule.kt

@@ -1,7 +1,7 @@
 package com.levimoreira.teammenagerapp.application.di
 
 import android.app.Application
-import android.arch.persistence.room.Room
+import androidx.room.Room
 import com.levimoreira.teammenagerapp.application.data.AppDatabase
 import com.levimoreira.teammenagerapp.business.data.BusinessDao
 import com.levimoreira.teammenagerapp.organization.data.OrganizationDao

app/src/main/java/com/levimoreira/teammenagerapp/application/di/ViewModelKey.kt

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

app/src/main/java/com/levimoreira/teammenagerapp/application/entities/Address.kt

@@ -0,0 +1,5 @@
+package com.levimoreira.teammenagerapp.application.entities
+
+data class Address(val street: String, val number: String) {
+
+}

app/src/main/java/com/levimoreira/teammenagerapp/application/entities/Business.kt

@@ -1,9 +1,9 @@
 package com.levimoreira.teammenagerapp.application.entities
 
-import android.arch.persistence.room.ColumnInfo
-import android.arch.persistence.room.Entity
-import android.arch.persistence.room.ForeignKey
-import android.arch.persistence.room.PrimaryKey
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.ForeignKey
+import androidx.room.PrimaryKey
 import com.levimoreira.teammenagerapp.application.entities.Business.Companion.TABLE_NAME
 
 

app/src/main/java/com/levimoreira/teammenagerapp/application/entities/BusinessPerson.kt

@@ -0,0 +1,29 @@
+package com.levimoreira.teammenagerapp.application.entities
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.ForeignKey
+import androidx.room.ForeignKey.CASCADE
+import com.levimoreira.teammenagerapp.application.entities.BusinessPerson.Companion.COLUMN_BUSINESS
+import com.levimoreira.teammenagerapp.application.entities.BusinessPerson.Companion.COLUMN_PERSON
+import com.levimoreira.teammenagerapp.application.entities.BusinessPerson.Companion.TABLE_NAME
+
+@Entity(tableName = TABLE_NAME,
+        primaryKeys = [COLUMN_PERSON, COLUMN_BUSINESS],
+        foreignKeys = [(ForeignKey(entity = Person::class,
+                parentColumns = ["id"],
+                childColumns = [COLUMN_PERSON],
+                onDelete = ForeignKey.CASCADE)),
+            (ForeignKey(entity = Business::class,
+                    parentColumns = ["id"],
+                    childColumns = [COLUMN_BUSINESS],
+                    onDelete = CASCADE))]
+)
+data class BusinessPerson(@ColumnInfo(name = COLUMN_PERSON) var personId: Long,
+                          @ColumnInfo(name = COLUMN_BUSINESS) var businessId: Long) {
+    companion object {
+        const val TABLE_NAME = "business_person"
+        const val COLUMN_PERSON = "personId"
+        const val COLUMN_BUSINESS = "businessId"
+    }
+}

app/src/main/java/com/levimoreira/teammenagerapp/application/entities/Organization.kt

@@ -1,8 +1,8 @@
 package com.levimoreira.teammenagerapp.application.entities
 
-import android.arch.persistence.room.ColumnInfo
-import android.arch.persistence.room.Entity
-import android.arch.persistence.room.PrimaryKey
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
 import com.levimoreira.teammenagerapp.application.entities.Organization.Companion.TABLE_NAME