diff --git a/app/build.gradle b/app/build.gradle
index d324f4e..1963aea 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'io.fabric.tools:gradle:1.25.4'
+        classpath 'io.fabric.tools:gradle:1.26.1'
     }
 }
 
@@ -18,15 +18,15 @@ apply from: 'checkstyle.gradle'
 preBuild.dependsOn('Checkstyle')
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     defaultConfig {
         applicationId "co.lateralview.myapp"
         minSdkVersion 21
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
 
         renderscriptTargetApi 19
@@ -77,24 +77,26 @@ android {
 }
 
 ext {
-    version_support = '27.1.1'
-    version_butterknife = "8.8.1"
+    version_appcompat_ = "1.0.2"
+    version_material_design = "1.0.0"
+    version_constraint_layout = "2.0.0-alpha3"
+    version_butterknife = "9.0.0-rc2"
     version_rxjava = '2.1.14'
-    version_rxandroid = '2.0.2'
+    version_rxandroid = '2.1.0'
     version_dagger = "2.16"
     version_retrofit = "2.4.0"
-    version_leakcanary = "1.5.4"
+    version_leakcanary = "1.6.2"
     version_permission = '3.2.0'
     version_firebase = '16.0.0'
-    version_glide = '4.7.1'
+    version_glide = '4.8.0'
 }
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation "com.android.support:recyclerview-v7:$version_support"
-    implementation "com.android.support:design:$version_support"
-    implementation "com.android.support:support-v13:$version_support"
-    implementation "com.android.support:appcompat-v7:$version_support"
+
+    implementation "androidx.appcompat:appcompat:$version_appcompat_"
+    implementation "androidx.constraintlayout:constraintlayout:$version_constraint_layout"
+    implementation "com.google.android.material:material:$version_material_design"
 
     // Dagger 2 - Dependency Injection
     implementation "com.google.dagger:dagger:$version_dagger"
@@ -149,8 +151,8 @@ dependencies {
     annotationProcessor "com.github.hotchemi:permissionsdispatcher-processor:$version_permission"
 
     testImplementation 'junit:junit:4.12'
-    testImplementation 'org.mockito:mockito-core:2.17.0'
-    testImplementation "org.robolectric:robolectric:3.8"
+    testImplementation 'org.mockito:mockito-core:2.23.0'
+    testImplementation "org.robolectric:robolectric:4.0.2"
 
     // Friendly Http Inspector through separate App
     debugImplementation 'com.readystatesoftware.chuck:library:1.1.0'
diff --git a/app/src/main/java/co/lateralview/myapp/domain/util/SnackBarData.java b/app/src/main/java/co/lateralview/myapp/domain/util/SnackBarData.java
index 07930ac..75016f3 100644
--- a/app/src/main/java/co/lateralview/myapp/domain/util/SnackBarData.java
+++ b/app/src/main/java/co/lateralview/myapp/domain/util/SnackBarData.java
@@ -1,6 +1,6 @@
 package co.lateralview.myapp.domain.util;
 
-import android.support.design.widget.Snackbar;
+import com.google.android.material.snackbar.Snackbar;
 
 import java.io.Serializable;
 
diff --git a/app/src/main/java/co/lateralview/myapp/infraestructure/manager/CameraManager.java b/app/src/main/java/co/lateralview/myapp/infraestructure/manager/CameraManager.java
index 7988adf..4cdb880 100644
--- a/app/src/main/java/co/lateralview/myapp/infraestructure/manager/CameraManager.java
+++ b/app/src/main/java/co/lateralview/myapp/infraestructure/manager/CameraManager.java
@@ -8,7 +8,7 @@
 import android.media.ExifInterface;
 import android.net.Uri;
 import android.provider.MediaStore;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/app/src/main/java/co/lateralview/myapp/infraestructure/manager/CropManager.java b/app/src/main/java/co/lateralview/myapp/infraestructure/manager/CropManager.java
index bdc7c68..80ba897 100644
--- a/app/src/main/java/co/lateralview/myapp/infraestructure/manager/CropManager.java
+++ b/app/src/main/java/co/lateralview/myapp/infraestructure/manager/CropManager.java
@@ -2,7 +2,7 @@
 
 import android.app.Activity;
 import android.net.Uri;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 
 import com.soundcloud.android.crop.Crop;
 
diff --git a/app/src/main/java/co/lateralview/myapp/infraestructure/manager/GalleryPhotoManager.java b/app/src/main/java/co/lateralview/myapp/infraestructure/manager/GalleryPhotoManager.java
index a0ac8b0..c3154a7 100644
--- a/app/src/main/java/co/lateralview/myapp/infraestructure/manager/GalleryPhotoManager.java
+++ b/app/src/main/java/co/lateralview/myapp/infraestructure/manager/GalleryPhotoManager.java
@@ -4,7 +4,7 @@
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.net.Uri;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 
 import java.io.File;
 
diff --git a/app/src/main/java/co/lateralview/myapp/infraestructure/manager/InternetManager.java b/app/src/main/java/co/lateralview/myapp/infraestructure/manager/InternetManager.java
index 7c8f242..62371d2 100644
--- a/app/src/main/java/co/lateralview/myapp/infraestructure/manager/InternetManager.java
+++ b/app/src/main/java/co/lateralview/myapp/infraestructure/manager/InternetManager.java
@@ -14,7 +14,7 @@ public InternetManager(Context context) {
 
     public Boolean isOnline() {
         NetworkInfo netInfo = mConnectivityManager.getActiveNetworkInfo();
-        return netInfo != null && netInfo.isConnectedOrConnecting();
+        return netInfo != null && netInfo.isConnected();
     }
 
     public boolean onWifi() {
diff --git a/app/src/main/java/co/lateralview/myapp/infraestructure/manager/SocialManager.java b/app/src/main/java/co/lateralview/myapp/infraestructure/manager/SocialManager.java
index f3a7aca..552b453 100644
--- a/app/src/main/java/co/lateralview/myapp/infraestructure/manager/SocialManager.java
+++ b/app/src/main/java/co/lateralview/myapp/infraestructure/manager/SocialManager.java
@@ -4,7 +4,7 @@
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.net.Uri;
-import android.support.v4.app.ShareCompat;
+import androidx.core.app.ShareCompat;
 
 import co.lateralview.myapp.infraestructure.manager.implementation.FileManagerImpl;
 
diff --git a/app/src/main/java/co/lateralview/myapp/infraestructure/manager/implementation/FileManagerImpl.java b/app/src/main/java/co/lateralview/myapp/infraestructure/manager/implementation/FileManagerImpl.java
index 6a7db9e..11d5350 100644
--- a/app/src/main/java/co/lateralview/myapp/infraestructure/manager/implementation/FileManagerImpl.java
+++ b/app/src/main/java/co/lateralview/myapp/infraestructure/manager/implementation/FileManagerImpl.java
@@ -4,8 +4,6 @@
 import android.graphics.Bitmap;
 import android.net.Uri;
 import android.os.Environment;
-import android.support.annotation.Nullable;
-import android.support.v4.content.FileProvider;
 
 import java.io.ByteArrayOutputStream;
 import java.io.Closeable;
@@ -16,6 +14,8 @@
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
+import androidx.annotation.Nullable;
+import androidx.core.content.FileProvider;
 import co.lateralview.myapp.infraestructure.manager.interfaces.FileManager;
 
 public class FileManagerImpl implements FileManager {
diff --git a/app/src/main/java/co/lateralview/myapp/infraestructure/pushNotification/PushNotificationIntentReceiver.java b/app/src/main/java/co/lateralview/myapp/infraestructure/pushNotification/PushNotificationIntentReceiver.java
index 179152b..cf11a70 100644
--- a/app/src/main/java/co/lateralview/myapp/infraestructure/pushNotification/PushNotificationIntentReceiver.java
+++ b/app/src/main/java/co/lateralview/myapp/infraestructure/pushNotification/PushNotificationIntentReceiver.java
@@ -3,7 +3,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.content.WakefulBroadcastReceiver;
+import androidx.legacy.content.WakefulBroadcastReceiver;
 
 import co.lateralview.myapp.application.MyApp;
 import co.lateralview.myapp.infraestructure.pushNotification.processor.base.NotificationType;
diff --git a/app/src/main/java/co/lateralview/myapp/infraestructure/pushNotification/processor/base/PushNotificationProcessor.java b/app/src/main/java/co/lateralview/myapp/infraestructure/pushNotification/processor/base/PushNotificationProcessor.java
index 2d1e784..a79b01d 100644
--- a/app/src/main/java/co/lateralview/myapp/infraestructure/pushNotification/processor/base/PushNotificationProcessor.java
+++ b/app/src/main/java/co/lateralview/myapp/infraestructure/pushNotification/processor/base/PushNotificationProcessor.java
@@ -5,7 +5,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.media.RingtoneManager;
-import android.support.v4.app.NotificationCompat;
+import androidx.core.app.NotificationCompat;
 
 import java.io.Serializable;
 
diff --git a/app/src/main/java/co/lateralview/myapp/ui/activities/base/BaseActivity.java b/app/src/main/java/co/lateralview/myapp/ui/activities/base/BaseActivity.java
index a1c87e3..5545b14 100644
--- a/app/src/main/java/co/lateralview/myapp/ui/activities/base/BaseActivity.java
+++ b/app/src/main/java/co/lateralview/myapp/ui/activities/base/BaseActivity.java
@@ -7,18 +7,19 @@
 import android.content.IntentFilter;
 import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.design.widget.Snackbar;
-import android.support.v7.app.AppCompatActivity;
 import android.view.MenuItem;
 import android.widget.Toast;
 
+import com.google.android.material.snackbar.Snackbar;
+
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.List;
 
 import javax.inject.Inject;
 
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
 import co.lateralview.myapp.R;
 import co.lateralview.myapp.application.AppComponent;
 import co.lateralview.myapp.application.MyApp;
diff --git a/app/src/main/java/co/lateralview/myapp/ui/activities/base/fragments/BaseDialogFragment.java b/app/src/main/java/co/lateralview/myapp/ui/activities/base/fragments/BaseDialogFragment.java
index f7262f6..a0ea50a 100644
--- a/app/src/main/java/co/lateralview/myapp/ui/activities/base/fragments/BaseDialogFragment.java
+++ b/app/src/main/java/co/lateralview/myapp/ui/activities/base/fragments/BaseDialogFragment.java
@@ -1,6 +1,6 @@
 package co.lateralview.myapp.ui.activities.base.fragments;
 
-import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
 
 import co.lateralview.myapp.application.AppComponent;
 import co.lateralview.myapp.ui.activities.base.Base;
diff --git a/app/src/main/java/co/lateralview/myapp/ui/activities/base/fragments/BaseFragment.java b/app/src/main/java/co/lateralview/myapp/ui/activities/base/fragments/BaseFragment.java
index e4fd4a4..0a30547 100644
--- a/app/src/main/java/co/lateralview/myapp/ui/activities/base/fragments/BaseFragment.java
+++ b/app/src/main/java/co/lateralview/myapp/ui/activities/base/fragments/BaseFragment.java
@@ -2,11 +2,11 @@
 
 import android.app.Fragment;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
 import android.view.View;
 
 import javax.inject.Inject;
 
+import androidx.annotation.Nullable;
 import co.lateralview.myapp.application.AppComponent;
 import co.lateralview.myapp.infraestructure.manager.interfaces.ImageManager;
 import co.lateralview.myapp.ui.activities.base.Base;
diff --git a/app/src/main/java/co/lateralview/myapp/ui/dialog/DatePickerDialogFragment.java b/app/src/main/java/co/lateralview/myapp/ui/dialog/DatePickerDialogFragment.java
index d00637b..954933d 100644
--- a/app/src/main/java/co/lateralview/myapp/ui/dialog/DatePickerDialogFragment.java
+++ b/app/src/main/java/co/lateralview/myapp/ui/dialog/DatePickerDialogFragment.java
@@ -3,12 +3,13 @@
 import android.app.DatePickerDialog;
 import android.app.Dialog;
 import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
 import android.widget.DatePicker;
 
 import java.util.Calendar;
 import java.util.Date;
 
+import androidx.fragment.app.DialogFragment;
+
 public class DatePickerDialogFragment extends DialogFragment implements
         DatePickerDialog.OnDateSetListener {
     public static final String TAG = "DatePickerDialogFragment";
diff --git a/app/src/main/java/co/lateralview/myapp/ui/util/DialogUtils.java b/app/src/main/java/co/lateralview/myapp/ui/util/DialogUtils.java
index 7dcebf1..156fa8b 100644
--- a/app/src/main/java/co/lateralview/myapp/ui/util/DialogUtils.java
+++ b/app/src/main/java/co/lateralview/myapp/ui/util/DialogUtils.java
@@ -2,7 +2,7 @@
 
 import android.content.Context;
 import android.content.DialogInterface;
-import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 
 public final class DialogUtils {
 
diff --git a/app/src/main/java/co/lateralview/myapp/ui/util/SnackBarHelper.java b/app/src/main/java/co/lateralview/myapp/ui/util/SnackBarHelper.java
index 89dcf8a..82a49d5 100644
--- a/app/src/main/java/co/lateralview/myapp/ui/util/SnackBarHelper.java
+++ b/app/src/main/java/co/lateralview/myapp/ui/util/SnackBarHelper.java
@@ -3,7 +3,7 @@
 
 import android.app.Activity;
 import android.graphics.Color;
-import android.support.design.widget.Snackbar;
+import com.google.android.material.snackbar.Snackbar;
 import android.view.View;
 import android.widget.TextView;
 
@@ -65,7 +65,7 @@ public static Snackbar createSnackBar(View view, String description, String acti
         }
 
         TextView textView = (TextView) snackBarView.findViewById(
-                android.support.design.R.id.snackbar_text);
+                com.google.android.material.R.id.snackbar_text);
 
         textView.setOnClickListener(v -> snackbar.dismiss());
 
diff --git a/app/src/main/java/co/lateralview/myapp/ui/util/ToolbarUtils.java b/app/src/main/java/co/lateralview/myapp/ui/util/ToolbarUtils.java
index c9ca495..a0244ea 100644
--- a/app/src/main/java/co/lateralview/myapp/ui/util/ToolbarUtils.java
+++ b/app/src/main/java/co/lateralview/myapp/ui/util/ToolbarUtils.java
@@ -1,14 +1,14 @@
 package co.lateralview.myapp.ui.util;
 
 import android.app.Activity;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.ActionMenuView;
-import android.support.v7.widget.Toolbar;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.ActionMenuView;
+import androidx.appcompat.widget.Toolbar;
 import co.lateralview.myapp.R;
 
 public final class ToolbarUtils {
diff --git a/app/src/main/java/co/lateralview/myapp/ui/util/UIUtils.java b/app/src/main/java/co/lateralview/myapp/ui/util/UIUtils.java
index 1a769dc..e25eb92 100644
--- a/app/src/main/java/co/lateralview/myapp/ui/util/UIUtils.java
+++ b/app/src/main/java/co/lateralview/myapp/ui/util/UIUtils.java
@@ -11,7 +11,6 @@
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.GradientDrawable;
 import android.os.Build;
-import android.support.v4.content.ContextCompat;
 import android.text.Spannable;
 import android.text.SpannableString;
 import android.text.style.TextAppearanceSpan;
@@ -30,6 +29,8 @@
 import java.net.HttpURLConnection;
 import java.net.URL;
 
+import androidx.core.content.ContextCompat;
+
 public abstract class UIUtils {
     public static void setStatusBarColor(Activity activity, int color) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 3279163..5a6aded 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fitsSystemWindows="true">
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
@@ -15,9 +15,9 @@
             android:layout_height="wrap_content"
             layout="@layout/toolbar"/>
 
-    </android.support.design.widget.AppBarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
-    <android.support.v4.widget.NestedScrollView
+    <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
@@ -26,9 +26,9 @@
             android:id="@+id/contentMain"
             layout="@layout/content_main"/>
 
-    </android.support.v4.widget.NestedScrollView>
+    </androidx.core.widget.NestedScrollView>
 
-    <android.support.design.widget.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/fab"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -36,4 +36,4 @@
         android:layout_gravity="bottom|end"
         android:src="@android:drawable/ic_input_add"/>
 
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/toolbar.xml b/app/src/main/res/layout/toolbar.xml
index 8ea20db..4e6505b 100644
--- a/app/src/main/res/layout/toolbar.xml
+++ b/app/src/main/res/layout/toolbar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.Toolbar
+<androidx.appcompat.widget.Toolbar
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/toolbar"
diff --git a/app/src/main/res/layout/toolbar_without_elevation.xml b/app/src/main/res/layout/toolbar_without_elevation.xml
index 4775551..62c21ce 100644
--- a/app/src/main/res/layout/toolbar_without_elevation.xml
+++ b/app/src/main/res/layout/toolbar_without_elevation.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.Toolbar
+<androidx.appcompat.widget.Toolbar
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/toolbar"
diff --git a/app/src/test/java/co/lateralview/myapp/infraestructure/manager/InternetManagerTest.java b/app/src/test/java/co/lateralview/myapp/infraestructure/manager/InternetManagerTest.java
index 3acfc5e..a14b864 100644
--- a/app/src/test/java/co/lateralview/myapp/infraestructure/manager/InternetManagerTest.java
+++ b/app/src/test/java/co/lateralview/myapp/infraestructure/manager/InternetManagerTest.java
@@ -1,8 +1,12 @@
 package co.lateralview.myapp.infraestructure.manager;
 
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.robolectric.Shadows.shadowOf;
+
 import android.content.Context;
 import android.net.ConnectivityManager;
-import android.net.NetworkInfo.State;
+import android.net.NetworkInfo;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -12,16 +16,10 @@
 import org.robolectric.shadows.ShadowConnectivityManager;
 import org.robolectric.shadows.ShadowNetworkInfo;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.robolectric.Shadows.shadowOf;
-
 @RunWith(RobolectricTestRunner.class)
-public class InternetManagerTest
-{
-    private ShadowConnectivityManager mShadowConnectivityManager;
-    private ShadowNetworkInfo mShadowNetworkInfo;
+public class InternetManagerTest {
 
+    private ShadowConnectivityManager mShadowConnectivityManager;
     private InternetManager mInternetManager;
 
     @Before
@@ -29,38 +27,53 @@ public void setUpTest() {
         final Context context = RuntimeEnvironment.application.getApplicationContext();
         mInternetManager = new InternetManager(context);
 
-        ConnectivityManager connectivityManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
+        ConnectivityManager connectivityManager = (ConnectivityManager) context.getSystemService(
+                Context.CONNECTIVITY_SERVICE);
         mShadowConnectivityManager = shadowOf(connectivityManager);
-        mShadowNetworkInfo = shadowOf(mShadowConnectivityManager.getActiveNetworkInfo());
     }
 
     @Test
     public void itShouldReturnIsOnlineIfConnectedToNetwork() {
-        mShadowNetworkInfo.setConnectionStatus(State.CONNECTED);
+        NetworkInfo networkInfo = ShadowNetworkInfo.newInstance(NetworkInfo.DetailedState.CONNECTED,
+                ConnectivityManager.TYPE_WIFI, 0, true, true);
+        mShadowConnectivityManager.setActiveNetworkInfo(networkInfo);
+
         assertTrue(mInternetManager.isOnline());
     }
 
     @Test
     public void itShouldReturnIsOnlineIfIsConnectingToNetwork() {
-        mShadowNetworkInfo.setConnectionStatus(State.CONNECTING);
+        NetworkInfo networkInfo = ShadowNetworkInfo.newInstance(NetworkInfo.DetailedState.CONNECTING,
+                ConnectivityManager.TYPE_WIFI, 0, true, true);
+        mShadowConnectivityManager.setActiveNetworkInfo(networkInfo);
+
         assertTrue(mInternetManager.isOnline());
     }
 
     @Test
     public void itShouldReturnIsNotOnline() {
-        mShadowNetworkInfo.setConnectionStatus(State.DISCONNECTED);
+        NetworkInfo networkInfo = ShadowNetworkInfo.newInstance(NetworkInfo.DetailedState.DISCONNECTED,
+                ConnectivityManager.TYPE_WIFI, 0, true, false);
+        mShadowConnectivityManager.setActiveNetworkInfo(networkInfo);
+
         assertFalse(mInternetManager.isOnline());
     }
 
     @Test
     public void itShouldReturnOnWifi() {
-        mShadowConnectivityManager.setActiveNetworkInfo(mShadowConnectivityManager.getNetworkInfo(ConnectivityManager.TYPE_WIFI));
+        NetworkInfo networkInfo = ShadowNetworkInfo.newInstance(NetworkInfo.DetailedState.CONNECTED,
+                ConnectivityManager.TYPE_WIFI, 0, true, true);
+        mShadowConnectivityManager.setActiveNetworkInfo(networkInfo);
+
         assertTrue(mInternetManager.onWifi());
     }
 
     @Test
     public void itShouldReturnNotOnWifi() {
-        mShadowConnectivityManager.setActiveNetworkInfo(mShadowConnectivityManager.getNetworkInfo(ConnectivityManager.TYPE_MOBILE));
+        NetworkInfo networkInfo = ShadowNetworkInfo.newInstance(NetworkInfo.DetailedState.CONNECTED,
+                ConnectivityManager.TYPE_MOBILE, 0, true, true);
+        mShadowConnectivityManager.setActiveNetworkInfo(networkInfo);
+
         assertFalse(mInternetManager.onWifi());
     }
 }
diff --git a/build.gradle b/build.gradle
index 02fc64e..89c7c81 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,8 +4,8 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.2'
-        classpath 'com.google.gms:google-services:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.google.gms:google-services:4.2.0'
         classpath 'com.google.firebase:firebase-plugins:1.1.5'
     }
 }
diff --git a/gradle.properties b/gradle.properties
index 9598c69..25c7d53 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -18,4 +18,7 @@
 # org.gradle.parallel=true
 
 #Required for Butterknife with Jack Enabled
+android.enableJetifier=true
+android.useAndroidX=true
+android.enableUnitTestBinaryResources=true
 org.gradle.jvmargs=-Xmx1536m
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 078d098..6f05e9c 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu May 17 11:20:37 ART 2018
+#Mon Dec 31 10:56:07 CET 2018
 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-4.6-all.zip