diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 2fdf088..ee971fe 100644
Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 30aa626..db291c6 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,29 +1,131 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
-    <Objective-C-extensions>
-      <file>
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
-      </file>
-      <class>
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
-      </class>
-      <extensions>
-        <pair source="cpp" header="h" fileNamingConvention="NONE" />
-        <pair source="c" header="h" fileNamingConvention="NONE" />
-      </extensions>
-    </Objective-C-extensions>
+    <JetCodeStyleSettings>
+      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
+        <value>
+          <package name="java.util" alias="false" withSubpackages="false" />
+          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
+          <package name="io.ktor" alias="false" withSubpackages="true" />
+        </value>
+      </option>
+      <option name="PACKAGES_IMPORT_LAYOUT">
+        <value>
+          <package name="" alias="false" withSubpackages="true" />
+          <package name="java" alias="false" withSubpackages="true" />
+          <package name="javax" alias="false" withSubpackages="true" />
+          <package name="kotlin" alias="false" withSubpackages="true" />
+          <package name="" alias="true" withSubpackages="true" />
+        </value>
+      </option>
+    </JetCodeStyleSettings>
+    <codeStyleSettings language="XML">
+      <arrangement>
+        <rules>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>xmlns:android</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>xmlns:.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:id</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:name</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>name</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>style</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>ANDROID_ATTRIBUTE_ORDER</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>.*</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+        </rules>
+      </arrangement>
+    </codeStyleSettings>
   </code_scheme>
 </component>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 7ac24c7..5cd135a 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
+        <option name="testRunner" value="PLATFORM" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="modules">
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
new file mode 100644
index 0000000..70683e3
--- /dev/null
+++ b/.idea/jarRepositories.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="BintrayJCenter" />
+      <option name="name" value="BintrayJCenter" />
+      <option name="url" value="https://jcenter.bintray.com/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="Google" />
+      <option name="name" value="Google" />
+      <option name="url" value="https://dl.google.com/dl/android/maven2/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="$USER_HOME$/Library/Android/sdk/extras/google/m2repository" />
+      <option name="name" value="$USER_HOME$/Library/Android/sdk/extras/google/m2repository" />
+      <option name="url" value="file:$USER_HOME$/Library/Android/sdk/extras/google/m2repository/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="$USER_HOME$/Library/Android/sdk/extras/m2repository" />
+      <option name="name" value="$USER_HOME$/Library/Android/sdk/extras/m2repository" />
+      <option name="url" value="file:$USER_HOME$/Library/Android/sdk/extras/m2repository/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="$USER_HOME$/Library/Android/sdk/extras/android/m2repository" />
+      <option name="name" value="$USER_HOME$/Library/Android/sdk/extras/android/m2repository" />
+      <option name="url" value="file:$USER_HOME$/Library/Android/sdk/extras/android/m2repository/" />
+    </remote-repository>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index cfdce47..edf68ea 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -3,6 +3,8 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/GithubArchitectureComponents.iml" filepath="$PROJECT_DIR$/GithubArchitectureComponents.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/GithubArchitectureComponents-app.iml" filepath="$PROJECT_DIR$/.idea/modules/app/GithubArchitectureComponents-app.iml" group="GithubArchitectureComponents/app" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/Workspace-GithubArchitectureComponents.iml" filepath="$PROJECT_DIR$/.idea/modules/Workspace-GithubArchitectureComponents.iml" group="GithubArchitectureComponents" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
     </modules>
   </component>
diff --git a/app/build.gradle b/app/build.gradle
index b35b788..6c893c8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,15 +1,15 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 27
-    buildToolsVersion "27.0.3"
+    compileSdkVersion 29
+    buildToolsVersion '29.0.2'
     defaultConfig {
         applicationId "com.boisneyphilippe.githubarchitecturecomponents"
         minSdkVersion 19
-        targetSdkVersion 27
+        targetSdkVersion 29
         versionCode 1
         versionName "1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
     buildTypes {
         release {
@@ -25,32 +25,33 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'com.android.support:design:27.1.1'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
-    implementation 'com.android.support:recyclerview-v7:27.1.1'
+    implementation 'com.google.android.material:material:1.2.1'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.1'
+    implementation 'androidx.recyclerview:recyclerview:1.1.0'
     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'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 
     // ViewModel and LiveData
-    implementation "android.arch.lifecycle:extensions:1.1.1"
+    implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
     // alternatively, just ViewModel
-    implementation "android.arch.lifecycle:viewmodel:1.1.1"
+    implementation 'androidx.lifecycle:lifecycle-viewmodel:2.2.0'
     // alternatively, just LiveData
-    implementation "android.arch.lifecycle:livedata:1.1.1"
+    implementation 'androidx.lifecycle:lifecycle-livedata:2.2.0'
 
-    annotationProcessor "android.arch.lifecycle:compiler:1.1.1"
+    //noinspection LifecycleAnnotationProcessorWithJava8
+    annotationProcessor 'androidx.lifecycle:lifecycle-compiler:2.2.0'
 
     // Room (use 1.1.0-alpha2 for latest alpha)
-    implementation "android.arch.persistence.room:runtime:1.1.1"
-    annotationProcessor "android.arch.persistence.room:compiler:1.1.1"
+    implementation 'androidx.room:room-runtime:2.2.5'
+    annotationProcessor 'androidx.room:room-compiler:2.2.5'
 
     // GSON
-    compile 'com.google.code.gson:gson:2.8.2'
+    implementation 'com.google.code.gson:gson:2.8.5'
 
     // RETROFIT
-    compile 'com.squareup.retrofit2:retrofit:2.4.0'
-    compile 'com.squareup.retrofit2:converter-gson:2.4.0'
+    implementation 'com.squareup.retrofit2:retrofit:2.4.0'
+    implementation 'com.squareup.retrofit2:converter-gson:2.4.0'
 
     // DAGGER 2
     implementation 'com.google.dagger:dagger-android:2.17'
@@ -59,8 +60,8 @@ dependencies {
     annotationProcessor 'com.google.dagger:dagger-compiler:2.17'
 
     // BUTTERKNIFE
-    compile 'com.jakewharton:butterknife:8.8.1'
-    annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
+    implementation 'com.jakewharton:butterknife:10.0.0'
+    annotationProcessor 'com.jakewharton:butterknife-compiler:10.0.0'
 
     // GLIDE
     implementation 'com.github.bumptech.glide:glide:4.8.0'
diff --git a/app/src/androidTest/java/com/boisneyphilippe/githubarchitecturecomponents/db/DbTest.java b/app/src/androidTest/java/com/boisneyphilippe/githubarchitecturecomponents/db/DbTest.java
index 65beddb..f984dd0 100755
--- a/app/src/androidTest/java/com/boisneyphilippe/githubarchitecturecomponents/db/DbTest.java
+++ b/app/src/androidTest/java/com/boisneyphilippe/githubarchitecturecomponents/db/DbTest.java
@@ -17,8 +17,8 @@
 package com.boisneyphilippe.githubarchitecturecomponents.db;
 
 
-import android.arch.persistence.room.Room;
-import android.support.test.InstrumentationRegistry;
+import androidx.room.Room;
+import androidx.test.platform.app.InstrumentationRegistry;
 
 import com.boisneyphilippe.githubarchitecturecomponents.database.MyDatabase;
 
@@ -30,7 +30,7 @@ abstract public class DbTest {
 
     @Before
     public void initDb() {
-        db = Room.inMemoryDatabaseBuilder(InstrumentationRegistry.getContext(),
+        db = Room.inMemoryDatabaseBuilder(InstrumentationRegistry.getInstrumentation().getContext(),
                 MyDatabase.class).build();
     }
 
diff --git a/app/src/androidTest/java/com/boisneyphilippe/githubarchitecturecomponents/db/UserDaoTest.java b/app/src/androidTest/java/com/boisneyphilippe/githubarchitecturecomponents/db/UserDaoTest.java
index 86ce06c..2c29742 100644
--- a/app/src/androidTest/java/com/boisneyphilippe/githubarchitecturecomponents/db/UserDaoTest.java
+++ b/app/src/androidTest/java/com/boisneyphilippe/githubarchitecturecomponents/db/UserDaoTest.java
@@ -1,11 +1,8 @@
 package com.boisneyphilippe.githubarchitecturecomponents.db;
 
-import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import com.boisneyphilippe.githubarchitecturecomponents.database.entity.User;
-import com.boisneyphilippe.githubarchitecturecomponents.db.DbTest;
 import com.boisneyphilippe.githubarchitecturecomponents.utils.LiveDataTestUtil;
 
 import org.junit.Test;
@@ -15,7 +12,6 @@
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.*;
 
 /**
  * Instrumented test, which will execute on an Android device.
diff --git a/app/src/androidTest/java/com/boisneyphilippe/githubarchitecturecomponents/utils/LiveDataTestUtil.java b/app/src/androidTest/java/com/boisneyphilippe/githubarchitecturecomponents/utils/LiveDataTestUtil.java
index 78221fe..714cf25 100644
--- a/app/src/androidTest/java/com/boisneyphilippe/githubarchitecturecomponents/utils/LiveDataTestUtil.java
+++ b/app/src/androidTest/java/com/boisneyphilippe/githubarchitecturecomponents/utils/LiveDataTestUtil.java
@@ -1,8 +1,11 @@
 package com.boisneyphilippe.githubarchitecturecomponents.utils;
 
-import android.arch.lifecycle.LiveData;
-import android.arch.lifecycle.Observer;
-import android.support.annotation.Nullable;
+import android.os.Handler;
+import android.os.Looper;
+
+import androidx.lifecycle.LiveData;
+import androidx.lifecycle.Observer;
+import androidx.annotation.Nullable;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
@@ -23,7 +26,12 @@ public void onChanged(@Nullable T o) {
                 liveData.removeObserver(this);
             }
         };
-        liveData.observeForever(observer);
+        new Handler(Looper.getMainLooper()).post(new Runnable() {
+            @Override
+            public void run() {
+                liveData.observeForever(observer);
+            }
+        });
         latch.await(2, TimeUnit.SECONDS);
         //noinspection unchecked
         return (T) data[0];
diff --git a/app/src/main/java/com/boisneyphilippe/githubarchitecturecomponents/activities/MainActivity.java b/app/src/main/java/com/boisneyphilippe/githubarchitecturecomponents/activities/MainActivity.java
index 1adcc95..fce9c7d 100644
--- a/app/src/main/java/com/boisneyphilippe/githubarchitecturecomponents/activities/MainActivity.java
+++ b/app/src/main/java/com/boisneyphilippe/githubarchitecturecomponents/activities/MainActivity.java
@@ -1,7 +1,7 @@
 package com.boisneyphilippe.githubarchitecturecomponents.activities;
 
-import android.support.v4.app.Fragment;
-import android.support.v7.app.AppCompatActivity;
+import androidx.fragment.app.Fragment;
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 
 import com.boisneyphilippe.githubarchitecturecomponents.R;
@@ -10,7 +10,6 @@
 import javax.inject.Inject;
 
 import dagger.android.AndroidInjection;
-import dagger.android.AndroidInjector;
 import dagger.android.DispatchingAndroidInjector;
 import dagger.android.support.HasSupportFragmentInjector;
 
diff --git a/app/src/main/java/com/boisneyphilippe/githubarchitecturecomponents/database/MyDatabase.java b/app/src/main/java/com/boisneyphilippe/githubarchitecturecomponents/database/MyDatabase.java
index 1193e6e..678fceb 100644
--- a/app/src/main/java/com/boisneyphilippe/githubarchitecturecomponents/database/MyDatabase.java
+++ b/app/src/main/java/com/boisneyphilippe/githubarchitecturecomponents/database/MyDatabase.java
@@ -1,10 +1,9 @@
 package com.boisneyphilippe.githubarchitecturecomponents.database;
 
-import android.arch.persistence.room.Database;
-import android.arch.persistence.room.Room;
-import android.arch.persistence.room.RoomDatabase;
-import android.arch.persistence.room.TypeConverters;
-import android.content.Context;
+import androidx.room.Database;
+import androidx.room.Room;
+import androidx.room.RoomDatabase;
+import androidx.room.TypeConverters;
 
 import com.boisneyphilippe.githubarchitecturecomponents.database.converter.DateConverter;
 import com.boisneyphilippe.githubarchitecturecomponents.database.dao.UserDao;
diff --git a/app/src/main/java/com/boisneyphilippe/githubarchitecturecomponents/database/converter/DateConverter.java b/app/src/main/java/com/boisneyphilippe/githubarchitecturecomponents/database/converter/DateConverter.java
index 500aad7..582eaee 100644
--- a/app/src/main/java/com/boisneyphilippe/githubarchitecturecomponents/database/converter/DateConverter.java
+++ b/app/src/main/java/com/boisneyphilippe/githubarchitecturecomponents/database/converter/DateConverter.java
@@ -1,6 +1,6 @@
 package com.boisneyphilippe.githubarchitecturecomponents.database.converter;
 
-import android.arch.persistence.room.TypeConverter;
+import androidx.room.TypeConverter;
 
 import java.util.Date;
 
diff --git a/app/src/main/java/com/boisneyphilippe/githubarchitecturecomponents/database/dao/UserDao.java b/app/src/main/java/com/boisneyphilippe/githubarchitecturecomponents/database/dao/UserDao.java
index d103fc9..0e39729 100644
--- a/app/src/main/java/com/boisneyphilippe/githubarchitecturecomponents/database/dao/UserDao.java
+++ b/app/src/main/java/com/boisneyphilippe/githubarchitecturecomponents/database/dao/UserDao.java
@@ -1,15 +1,15 @@
 package com.boisneyphilippe.githubarchitecturecomponents.database.dao;
 
-import android.arch.lifecycle.LiveData;
-import android.arch.persistence.room.Dao;
-import android.arch.persistence.room.Insert;
-import android.arch.persistence.room.Query;
+import androidx.lifecycle.LiveData;
+import androidx.room.Dao;
+import androidx.room.Insert;
+import androidx.room.Query;
 
 import com.boisneyphilippe.githubarchitecturecomponents.database.entity.User;
 
 import java.util.Date;
 
-import static android.arch.persistence.room.OnConflictStrategy.REPLACE;
+import static androidx.room.OnConflictStrategy.REPLACE;
 
 /**
  * Created by Philippe on 02/03/2018.
diff --git a/app/src/main/java/com/boisneyphilippe/githubarchitecturecomponents/database/entity/User.java b/app/src/main/java/com/boisneyphilippe/githubarchitecturecomponents/database/entity/User.java
index 900ec82..11e3929 100644
--- a/app/src/main/java/com/boisneyphilippe/githubarchitecturecomponents/database/entity/User.java
+++ b/app/src/main/java/com/boisneyphilippe/githubarchitecturecomponents/database/entity/User.java
@@ -1,13 +1,12 @@
 package com.boisneyphilippe.githubarchitecturecomponents.database.entity;
 
-import android.arch.persistence.room.Entity;
-import android.arch.persistence.room.PrimaryKey;
-import android.support.annotation.NonNull;
+import androidx.room.Entity;
+import androidx.room.PrimaryKey;
+import androidx.annotation.NonNull;
 
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
 
-import java.time.OffsetDateTime;
 import java.util.Date;
 
 /**
diff --git a/app/src/main/java/com/boisneyphilippe/githubarchitecturecomponents/di/key/ViewModelKey.java b/app/src/main/java/com/boisneyphilippe/githubarchitecturecomponents/di/key/ViewModelKey.java
index e55d487..20a4234 100644
--- a/app/src/main/java/com/boisneyphilippe/githubarchitecturecomponents/di/key/ViewModelKey.java
+++ b/app/src/main/java/com/boisneyphilippe/githubarchitecturecomponents/di/key/ViewModelKey.java
@@ -1,6 +1,6 @@
 package com.boisneyphilippe.githubarchitecturecomponents.di.key;
 
-import android.arch.lifecycle.ViewModel;
+import androidx.lifecycle.ViewModel;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
diff --git a/app/src/main/java/com/boisneyphilippe/githubarchitecturecomponents/di/module/AppModule.java b/app/src/main/java/com/boisneyphilippe/githubarchitecturecomponents/di/module/AppModule.java
index dad16eb..c28002d 100644
--- a/app/src/main/java/com/boisneyphilippe/githubarchitecturecomponents/di/module/AppModule.java
+++ b/app/src/main/java/com/boisneyphilippe/githubarchitecturecomponents/di/module/AppModule.java
@@ -1,7 +1,7 @@
 package com.boisneyphilippe.githubarchitecturecomponents.di.module;
 
 import android.app.Application;
-import android.arch.persistence.room.Room;
+import androidx.room.Room;
 
 import com.boisneyphilippe.githubarchitecturecomponents.api.UserWebservice;
 import com.boisneyphilippe.githubarchitecturecomponents.database.MyDatabase;
diff --git a/app/src/main/java/com/boisneyphilippe/githubarchitecturecomponents/di/module/ViewModelModule.java b/app/src/main/java/com/boisneyphilippe/githubarchitecturecomponents/di/module/ViewModelModule.java
index b799472..d598fbb 100644
--- a/app/src/main/java/com/boisneyphilippe/githubarchitecturecomponents/di/module/ViewModelModule.java
+++ b/app/src/main/java/com/boisneyphilippe/githubarchitecturecomponents/di/module/ViewModelModule.java
@@ -1,7 +1,7 @@
 package com.boisneyphilippe.githubarchitecturecomponents.di.module;
 
-import android.arch.lifecycle.ViewModel;
-import android.arch.lifecycle.ViewModelProvider;
+import androidx.lifecycle.ViewModel;
+import androidx.lifecycle.ViewModelProvider;
 
 import com.boisneyphilippe.githubarchitecturecomponents.di.key.ViewModelKey;
 import com.boisneyphilippe.githubarchitecturecomponents.view_models.FactoryViewModel;
diff --git a/app/src/main/java/com/boisneyphilippe/githubarchitecturecomponents/fragments/UserProfileFragment.java b/app/src/main/java/com/boisneyphilippe/githubarchitecturecomponents/fragments/UserProfileFragment.java
index 0c050a9..ee1a458 100644
--- a/app/src/main/java/com/boisneyphilippe/githubarchitecturecomponents/fragments/UserProfileFragment.java
+++ b/app/src/main/java/com/boisneyphilippe/githubarchitecturecomponents/fragments/UserProfileFragment.java
@@ -1,20 +1,18 @@
 package com.boisneyphilippe.githubarchitecturecomponents.fragments;
 
 
-import android.arch.lifecycle.ViewModelProvider;
-import android.arch.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProvider;
+import androidx.lifecycle.ViewModelProviders;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.util.Log;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
-import android.widget.Toast;
 
-import com.boisneyphilippe.githubarchitecturecomponents.App;
 import com.boisneyphilippe.githubarchitecturecomponents.R;
 import com.boisneyphilippe.githubarchitecturecomponents.database.entity.User;
 import com.boisneyphilippe.githubarchitecturecomponents.view_models.UserProfileViewModel;
@@ -72,7 +70,7 @@ private void configureViewModel(){
         String userLogin = getArguments().getString(UID_KEY);
         viewModel = ViewModelProviders.of(this, viewModelFactory).get(UserProfileViewModel.class);
         viewModel.init(userLogin);
-        viewModel.getUser().observe(this, user -> updateUI(user));
+        viewModel.getUser().observe(getViewLifecycleOwner(), user -> updateUI(user));
     }
 
     // -----------------
diff --git a/app/src/main/java/com/boisneyphilippe/githubarchitecturecomponents/repositories/UserRepository.java b/app/src/main/java/com/boisneyphilippe/githubarchitecturecomponents/repositories/UserRepository.java
index 448602a..1d56434 100644
--- a/app/src/main/java/com/boisneyphilippe/githubarchitecturecomponents/repositories/UserRepository.java
+++ b/app/src/main/java/com/boisneyphilippe/githubarchitecturecomponents/repositories/UserRepository.java
@@ -1,6 +1,6 @@
 package com.boisneyphilippe.githubarchitecturecomponents.repositories;
 
-import android.arch.lifecycle.LiveData;
+import androidx.lifecycle.LiveData;
 import android.util.Log;
 import android.widget.Toast;
 
diff --git a/app/src/main/java/com/boisneyphilippe/githubarchitecturecomponents/view_models/FactoryViewModel.java b/app/src/main/java/com/boisneyphilippe/githubarchitecturecomponents/view_models/FactoryViewModel.java
index 1031f5e..d23218b 100644
--- a/app/src/main/java/com/boisneyphilippe/githubarchitecturecomponents/view_models/FactoryViewModel.java
+++ b/app/src/main/java/com/boisneyphilippe/githubarchitecturecomponents/view_models/FactoryViewModel.java
@@ -1,7 +1,7 @@
 package com.boisneyphilippe.githubarchitecturecomponents.view_models;
 
-import android.arch.lifecycle.ViewModel;
-import android.arch.lifecycle.ViewModelProvider;
+import androidx.lifecycle.ViewModel;
+import androidx.lifecycle.ViewModelProvider;
 
 import java.util.Map;
 
diff --git a/app/src/main/java/com/boisneyphilippe/githubarchitecturecomponents/view_models/UserProfileViewModel.java b/app/src/main/java/com/boisneyphilippe/githubarchitecturecomponents/view_models/UserProfileViewModel.java
index ae2235b..4a553b2 100644
--- a/app/src/main/java/com/boisneyphilippe/githubarchitecturecomponents/view_models/UserProfileViewModel.java
+++ b/app/src/main/java/com/boisneyphilippe/githubarchitecturecomponents/view_models/UserProfileViewModel.java
@@ -1,7 +1,7 @@
 package com.boisneyphilippe.githubarchitecturecomponents.view_models;
 
-import android.arch.lifecycle.LiveData;
-import android.arch.lifecycle.ViewModel;
+import androidx.lifecycle.LiveData;
+import androidx.lifecycle.ViewModel;
 
 import com.boisneyphilippe.githubarchitecturecomponents.database.entity.User;
 import com.boisneyphilippe.githubarchitecturecomponents.repositories.UserRepository;
diff --git a/build.gradle b/build.gradle
index 077cb2f..2deb66d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.4'
+        classpath 'com.android.tools.build:gradle:4.0.1'
         
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/gradle.properties b/gradle.properties
index aac7c9b..9e6fce1 100644
--- a/gradle.properties
+++ b/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.
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 84da236..0e6c31c 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Oct 01 20:01:08 CEST 2018
+#Thu Sep 24 01:39:42 BDT 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip