From 84ae3997e1f2d059fe1dc6ad1e7fa9a993e2cf36 Mon Sep 17 00:00:00 2001
From: Carlos Oliveira <carlos.oliveira@touchtec.com.br>
Date: Sat, 3 Aug 2019 22:40:44 -0300
Subject: [PATCH] Gradle 3.4.2 e API 29

Change-Id: Iedb0ed171adf7136084087ddb0673f044774f1b7
---
 app/build.gradle                              | 15 +++++++-------
 .../designsupportlibrary/AppBarActivity.java  |  9 +++++----
 .../CollapsingParallaxActivity.java           | 12 ++++++-----
 .../CollapsingToolbarActivity.java            | 12 ++++++-----
 .../CoordinatorActivity.java                  |  5 +++--
 .../CoordinatorCustomViewActivity.java        |  9 +++++----
 .../designsupportlibrary/CustomView.java      | 20 +++++++++++++------
 .../designsupportlibrary/ListAdapter.java     |  3 ++-
 .../designsupportlibrary/MainActivity.java    |  9 +++++----
 .../designsupportlibrary/TabsActivity.java    | 20 ++++++++++---------
 app/src/main/res/layout/activity_appbar.xml   | 12 +++++------
 .../layout/activity_collapsing_parallax.xml   | 20 +++++++++----------
 .../layout/activity_collapsing_toolbar.xml    | 18 ++++++++---------
 .../main/res/layout/activity_coordinator.xml  |  8 ++++----
 .../activity_coordinator_custom_view.xml      | 12 +++++------
 app/src/main/res/layout/activity_main.xml     |  4 ++--
 app/src/main/res/layout/activity_tabs.xml     | 14 ++++++-------
 app/src/main/res/layout/fragment_page.xml     |  2 +-
 build.gradle                                  |  4 +++-
 gradle/wrapper/gradle-wrapper.properties      |  4 ++--
 20 files changed, 117 insertions(+), 95 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index f53de7d..aeeed3c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.2"
+    compileSdkVersion 29
+    buildToolsVersion "29.0.1"
 
     defaultConfig {
         applicationId "com.example.andremion.designsupportlibrary"
-        minSdkVersion 15
-        targetSdkVersion 25
+        minSdkVersion 25
+        targetSdkVersion 29
         versionCode 1
         versionName "1.0"
     }
@@ -20,7 +20,8 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:design:25.3.1'
-    compile 'com.android.support:recyclerview-v7:25.3.1'
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation 'androidx.appcompat:appcompat:1.0.2'
+    implementation 'com.google.android.material:material:1.0.0'
+    implementation 'androidx.recyclerview:recyclerview:1.0.0'
 }
diff --git a/app/src/main/java/com/example/andremion/designsupportlibrary/AppBarActivity.java b/app/src/main/java/com/example/andremion/designsupportlibrary/AppBarActivity.java
index c7a5ac5..299a8be 100644
--- a/app/src/main/java/com/example/andremion/designsupportlibrary/AppBarActivity.java
+++ b/app/src/main/java/com/example/andremion/designsupportlibrary/AppBarActivity.java
@@ -1,10 +1,11 @@
 package com.example.andremion.designsupportlibrary;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.Toolbar;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/app/src/main/java/com/example/andremion/designsupportlibrary/CollapsingParallaxActivity.java b/app/src/main/java/com/example/andremion/designsupportlibrary/CollapsingParallaxActivity.java
index e80e071..d49905d 100644
--- a/app/src/main/java/com/example/andremion/designsupportlibrary/CollapsingParallaxActivity.java
+++ b/app/src/main/java/com/example/andremion/designsupportlibrary/CollapsingParallaxActivity.java
@@ -1,11 +1,13 @@
 package com.example.andremion.designsupportlibrary;
 
 import android.os.Bundle;
-import android.support.design.widget.CollapsingToolbarLayout;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.Toolbar;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.google.android.material.appbar.CollapsingToolbarLayout;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/app/src/main/java/com/example/andremion/designsupportlibrary/CollapsingToolbarActivity.java b/app/src/main/java/com/example/andremion/designsupportlibrary/CollapsingToolbarActivity.java
index e91b968..6884e96 100644
--- a/app/src/main/java/com/example/andremion/designsupportlibrary/CollapsingToolbarActivity.java
+++ b/app/src/main/java/com/example/andremion/designsupportlibrary/CollapsingToolbarActivity.java
@@ -1,11 +1,13 @@
 package com.example.andremion.designsupportlibrary;
 
 import android.os.Bundle;
-import android.support.design.widget.CollapsingToolbarLayout;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.Toolbar;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.google.android.material.appbar.CollapsingToolbarLayout;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/app/src/main/java/com/example/andremion/designsupportlibrary/CoordinatorActivity.java b/app/src/main/java/com/example/andremion/designsupportlibrary/CoordinatorActivity.java
index 948656a..b219eec 100644
--- a/app/src/main/java/com/example/andremion/designsupportlibrary/CoordinatorActivity.java
+++ b/app/src/main/java/com/example/andremion/designsupportlibrary/CoordinatorActivity.java
@@ -1,8 +1,9 @@
 package com.example.andremion.designsupportlibrary;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 
 public class CoordinatorActivity extends AppCompatActivity {
 
diff --git a/app/src/main/java/com/example/andremion/designsupportlibrary/CoordinatorCustomViewActivity.java b/app/src/main/java/com/example/andremion/designsupportlibrary/CoordinatorCustomViewActivity.java
index ef523a4..9e3a3da 100644
--- a/app/src/main/java/com/example/andremion/designsupportlibrary/CoordinatorCustomViewActivity.java
+++ b/app/src/main/java/com/example/andremion/designsupportlibrary/CoordinatorCustomViewActivity.java
@@ -1,10 +1,11 @@
 package com.example.andremion.designsupportlibrary;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.Toolbar;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/app/src/main/java/com/example/andremion/designsupportlibrary/CustomView.java b/app/src/main/java/com/example/andremion/designsupportlibrary/CustomView.java
index af6a23d..b2a2bc2 100644
--- a/app/src/main/java/com/example/andremion/designsupportlibrary/CustomView.java
+++ b/app/src/main/java/com/example/andremion/designsupportlibrary/CustomView.java
@@ -2,15 +2,17 @@
 
 import android.content.Context;
 import android.graphics.Rect;
-import android.support.design.widget.AppBarLayout;
-import android.support.design.widget.CoordinatorLayout;
-import android.support.v4.view.ViewCompat;
 import android.util.AttributeSet;
 import android.view.View;
-import android.widget.TextView;
 
-@CoordinatorLayout.DefaultBehavior(CustomView.Behavior.class)
-public class CustomView extends TextView {
+import androidx.annotation.NonNull;
+import androidx.appcompat.widget.AppCompatTextView;
+import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import androidx.core.view.ViewCompat;
+
+import com.google.android.material.appbar.AppBarLayout;
+
+public class CustomView extends AppCompatTextView implements CoordinatorLayout.AttachedBehavior {
 
     public CustomView(Context context) {
         super(context);
@@ -24,6 +26,12 @@ public CustomView(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
     }
 
+    @NonNull
+    @Override
+    public CoordinatorLayout.Behavior getBehavior() {
+        return new Behavior();
+    }
+
     public static class Behavior extends CoordinatorLayout.Behavior<CustomView> {
 
         @Override
diff --git a/app/src/main/java/com/example/andremion/designsupportlibrary/ListAdapter.java b/app/src/main/java/com/example/andremion/designsupportlibrary/ListAdapter.java
index 628c084..58899d5 100644
--- a/app/src/main/java/com/example/andremion/designsupportlibrary/ListAdapter.java
+++ b/app/src/main/java/com/example/andremion/designsupportlibrary/ListAdapter.java
@@ -1,11 +1,12 @@
 package com.example.andremion.designsupportlibrary;
 
-import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
+import androidx.recyclerview.widget.RecyclerView;
+
 import java.util.List;
 
 public class ListAdapter extends RecyclerView.Adapter<ListAdapter.ViewHolder> {
diff --git a/app/src/main/java/com/example/andremion/designsupportlibrary/MainActivity.java b/app/src/main/java/com/example/andremion/designsupportlibrary/MainActivity.java
index 20efd19..c5d39ea 100644
--- a/app/src/main/java/com/example/andremion/designsupportlibrary/MainActivity.java
+++ b/app/src/main/java/com/example/andremion/designsupportlibrary/MainActivity.java
@@ -2,12 +2,13 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.Toolbar;
 import android.view.View;
 
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/app/src/main/java/com/example/andremion/designsupportlibrary/TabsActivity.java b/app/src/main/java/com/example/andremion/designsupportlibrary/TabsActivity.java
index 2b5ffa9..704733e 100644
--- a/app/src/main/java/com/example/andremion/designsupportlibrary/TabsActivity.java
+++ b/app/src/main/java/com/example/andremion/designsupportlibrary/TabsActivity.java
@@ -1,19 +1,21 @@
 package com.example.andremion.designsupportlibrary;
 
 import android.os.Bundle;
-import android.support.design.widget.TabLayout;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentPagerAdapter;
-import android.support.v4.view.ViewPager;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.Toolbar;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentPagerAdapter;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.viewpager.widget.ViewPager;
+
+import com.google.android.material.tabs.TabLayout;
+
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/app/src/main/res/layout/activity_appbar.xml b/app/src/main/res/layout/activity_appbar.xml
index e258d17..100050d 100644
--- a/app/src/main/res/layout/activity_appbar.xml
+++ b/app/src/main/res/layout/activity_appbar.xml
@@ -1,26 +1,26 @@
-<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.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@android:id/list"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
 
-        <android.support.v7.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:layout_scrollFlags="scroll|enterAlways"/>
 
-    </android.support.design.widget.AppBarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/activity_collapsing_parallax.xml b/app/src/main/res/layout/activity_collapsing_parallax.xml
index 16e1938..459be8b 100644
--- a/app/src/main/res/layout/activity_collapsing_parallax.xml
+++ b/app/src/main/res/layout/activity_collapsing_parallax.xml
@@ -1,17 +1,17 @@
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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:id="@+id/app_bar"
         android:layout_width="match_parent"
         android:layout_height="192dp"
         android:fitsSystemWindows="true"
         app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
 
-        <android.support.design.widget.CollapsingToolbarLayout
+        <com.google.android.material.appbar.CollapsingToolbarLayout
             android:id="@+id/collapsing_toolbar"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -24,26 +24,26 @@
                 android:layout_height="match_parent"
                 android:fitsSystemWindows="true"
                 android:scaleType="centerCrop"
-                android:src="@drawable/desert"
+                app:srcCompat="@drawable/desert"
                 app:layout_collapseMode="parallax" />
 
-            <android.support.v7.widget.Toolbar
+            <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize"
                 app:layout_collapseMode="pin" />
 
-        </android.support.design.widget.CollapsingToolbarLayout>
+        </com.google.android.material.appbar.CollapsingToolbarLayout>>
 
-    </android.support.design.widget.AppBarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@android:id/list"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
-    <android.support.design.widget.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_margin="@dimen/activity_horizontal_margin"
@@ -52,4 +52,4 @@
         app:layout_anchor="@id/app_bar"
         app:layout_anchorGravity="bottom|end" />
 
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/activity_collapsing_toolbar.xml b/app/src/main/res/layout/activity_collapsing_toolbar.xml
index bdaa3de..adb1203 100644
--- a/app/src/main/res/layout/activity_collapsing_toolbar.xml
+++ b/app/src/main/res/layout/activity_collapsing_toolbar.xml
@@ -1,37 +1,37 @@
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@android:id/list"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/app_bar"
         android:layout_width="match_parent"
         android:layout_height="192dp"
         app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
 
-        <android.support.design.widget.CollapsingToolbarLayout
+        <com.google.android.material.appbar.CollapsingToolbarLayout
             android:id="@+id/collapsing_toolbar"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             app:layout_scrollFlags="scroll|exitUntilCollapsed|snap">
 
-            <android.support.v7.widget.Toolbar
+            <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize"
                 app:layout_collapseMode="pin" />
 
-        </android.support.design.widget.CollapsingToolbarLayout>
+        </com.google.android.material.appbar.CollapsingToolbarLayout>
 
-    </android.support.design.widget.AppBarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
-    <android.support.design.widget.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_margin="@dimen/activity_horizontal_margin"
@@ -40,4 +40,4 @@
         app:layout_anchor="@id/app_bar"
         app:layout_anchorGravity="bottom|end" />
 
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/activity_coordinator.xml b/app/src/main/res/layout/activity_coordinator.xml
index 650f3f5..db65386 100644
--- a/app/src/main/res/layout/activity_coordinator.xml
+++ b/app/src/main/res/layout/activity_coordinator.xml
@@ -1,20 +1,20 @@
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="?colorPrimary"
         app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" />
 
-    <android.support.design.widget.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|end"
         android:layout_margin="@dimen/activity_horizontal_margin"
         android:src="@drawable/ic_add" />
 
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/activity_coordinator_custom_view.xml b/app/src/main/res/layout/activity_coordinator_custom_view.xml
index 41eecec..e133cc5 100644
--- a/app/src/main/res/layout/activity_coordinator_custom_view.xml
+++ b/app/src/main/res/layout/activity_coordinator_custom_view.xml
@@ -1,26 +1,26 @@
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@android:id/list"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
 
-        <android.support.v7.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:layout_scrollFlags="scroll|enterAlways" />
 
-    </android.support.design.widget.AppBarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
     <com.example.andremion.designsupportlibrary.CustomView
         android:layout_width="match_parent"
@@ -31,4 +31,4 @@
         android:text="My Custom View"
         android:textAppearance="?android:attr/textAppearanceLargeInverse" />
 
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index e319618..fd2ded3 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -5,14 +5,14 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="?colorPrimary"
         app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"/>
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@android:id/list"
         android:layout_width="match_parent"
         android:layout_height="match_parent"/>
diff --git a/app/src/main/res/layout/activity_tabs.xml b/app/src/main/res/layout/activity_tabs.xml
index b23bf64..0c87a4b 100644
--- a/app/src/main/res/layout/activity_tabs.xml
+++ b/app/src/main/res/layout/activity_tabs.xml
@@ -1,31 +1,31 @@
-<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.support.v4.view.ViewPager
+    <androidx.viewpager.widget.ViewPager
         android:id="@+id/view_pager"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
 
-        <android.support.v7.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:layout_scrollFlags="scroll|enterAlways"/>
 
-        <android.support.design.widget.TabLayout
+        <com.google.android.material.tabs.TabLayout
             android:id="@+id/tab_layout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"/>
 
-    </android.support.design.widget.AppBarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_page.xml b/app/src/main/res/layout/fragment_page.xml
index d5facad..43ac197 100644
--- a/app/src/main/res/layout/fragment_page.xml
+++ b/app/src/main/res/layout/fragment_page.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.RecyclerView
+<androidx.recyclerview.widget.RecyclerView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"/>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index ea98e44..b981ff7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,9 +3,10 @@
 buildscript {
     repositories {
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.2'
+        classpath 'com.android.tools.build:gradle:3.4.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -14,6 +15,7 @@ buildscript {
 
 allprojects {
     repositories {
+        google()
         jcenter()
     }
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index cb2889c..d2d8776 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu May 25 22:09:38 WEST 2017
+#Sat Aug 03 21:03:44 BRT 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip