sdk: migrate to SDK 28 and AndroidX

2018-11-04 11:26:07 +08:00 · 2018-11-04 11:26:07 +08:00 · 756ac6e64f
commit 756ac6e64f
parent 831e1f1575
30 changed files with 88 additions and 86 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -5,17 +5,17 @@ android:
  components:
    - tools
    - platform-tools
-    - build-tools-27.0.3
-    - android-27
+    - build-tools-28.0.3
+    - android-28
    - extra-android-support
    - extra-google-m2repository
    - extra-android-m2repository
  licenses:
    - '.+'
 before_install:
-  - yes | sdkmanager "platforms;android-27"
+- yes | sdkmanager "platforms;android-28"
 script:
  - chmod 777 gradlew
  - ./gradlew clean assembleDebug
 after_success:
-  - bash <(curl -s https://codecov.io/bash)
+  - bash <(curl -s https://codecov.io/bash)
--- a/app/build.gradle
+++ b/app/build.gradle
@ -4,12 +4,12 @@ apply plugin: 'io.fabric'
 def gitCommit = 'git rev-parse --short HEAD'.execute([], project.rootDir).text.trim()

 android {
-    compileSdkVersion 27
-    buildToolsVersion "27.0.3"
+    compileSdkVersion 28
+    buildToolsVersion "28.0.3"
    defaultConfig {
        applicationId "org.itxtech.daedalus"
        minSdkVersion 15
-        targetSdkVersion 27
+        targetSdkVersion 28
        versionCode 17
        versionName "1.12.1"

@ -39,19 +39,19 @@ android {

 dependencies {
    //Support
-    implementation 'com.android.support:appcompat-v7:27.1.1'
-    implementation 'com.android.support:design:27.1.1'
-    implementation 'com.android.support:support-v4:27.1.1'
-    implementation 'com.android.support:percent:27.1.1'
-    implementation 'com.android.support:cardview-v7:27.1.1'
+    implementation 'androidx.appcompat:appcompat:1.0.0'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation 'androidx.percentlayout:percentlayout:1.0.0'
+    implementation 'androidx.cardview:cardview:1.0.0'
+    implementation 'com.google.android.material:material:1.0.0'
    //DNS
    implementation 'org.pcap4j:pcap4j-core:1.7.3'
    implementation 'org.pcap4j:pcap4j-packetfactory-static:1.7.3'
-    implementation 'org.minidns:minidns-client:0.3.2'
+    implementation 'org.minidns:minidns-client:0.3.3'
    implementation 'com.google.code.gson:gson:2.8.5'
    implementation 'com.squareup.okhttp3:okhttp:3.11.0'
    //Analytics
-    implementation 'com.google.firebase:firebase-core:16.0.4'
+    implementation 'com.google.firebase:firebase-core:16.0.5'
    implementation 'com.crashlytics.sdk.android:crashlytics:2.9.5'
 }

--- a/app/src/main/java/org/itxtech/daedalus/activity/ConfigActivity.java
+++ b/app/src/main/java/org/itxtech/daedalus/activity/ConfigActivity.java
@ -5,10 +5,10 @@ import android.app.FragmentTransaction;
 import android.graphics.Color;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.graphics.drawable.DrawableCompat;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import androidx.core.content.ContextCompat;
+import androidx.core.graphics.drawable.DrawableCompat;
 import org.itxtech.daedalus.Daedalus;
 import org.itxtech.daedalus.R;
 import org.itxtech.daedalus.fragment.ConfigFragment;
--- a/app/src/main/java/org/itxtech/daedalus/activity/MainActivity.java
+++ b/app/src/main/java/org/itxtech/daedalus/activity/MainActivity.java
@ -7,19 +7,19 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.net.VpnService;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.design.widget.NavigationView;
-import android.support.v4.view.GravityCompat;
-import android.support.v4.widget.DrawerLayout;
-import android.support.v7.app.ActionBarDrawerToggle;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
 import android.util.Log;
 import android.view.MenuItem;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.Button;
 import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.ActionBarDrawerToggle;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import androidx.core.view.GravityCompat;
+import androidx.drawerlayout.widget.DrawerLayout;
+import com.google.android.material.navigation.NavigationView;
 import org.itxtech.daedalus.BuildConfig;
 import org.itxtech.daedalus.Daedalus;
 import org.itxtech.daedalus.R;
--- a/app/src/main/java/org/itxtech/daedalus/fragment/ConfigFragment.java
+++ b/app/src/main/java/org/itxtech/daedalus/fragment/ConfigFragment.java
@ -2,7 +2,7 @@ package org.itxtech.daedalus.fragment;

 import android.content.Intent;
 import android.preference.PreferenceFragment;
-import android.support.v7.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar;

 /**
 * Daedalus Project
--- a/app/src/main/java/org/itxtech/daedalus/fragment/DNSServerConfigFragment.java
+++ b/app/src/main/java/org/itxtech/daedalus/fragment/DNSServerConfigFragment.java
@ -3,11 +3,11 @@ package org.itxtech.daedalus.fragment;
 import android.app.AlertDialog;
 import android.os.Bundle;
 import android.preference.EditTextPreference;
-import android.support.design.widget.Snackbar;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
+import com.google.android.material.snackbar.Snackbar;
 import org.itxtech.daedalus.Daedalus;
 import org.itxtech.daedalus.R;
 import org.itxtech.daedalus.activity.ConfigActivity;
--- a/app/src/main/java/org/itxtech/daedalus/fragment/DNSServersFragment.java
+++ b/app/src/main/java/org/itxtech/daedalus/fragment/DNSServersFragment.java
@ -2,16 +2,16 @@ package org.itxtech.daedalus.fragment;

 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.design.widget.FloatingActionButton;
-import android.support.design.widget.Snackbar;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.helper.ItemTouchHelper;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.ItemTouchHelper;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import com.google.android.material.snackbar.Snackbar;
 import org.itxtech.daedalus.Daedalus;
 import org.itxtech.daedalus.R;
 import org.itxtech.daedalus.activity.ConfigActivity;
--- a/app/src/main/java/org/itxtech/daedalus/fragment/GlobalConfigFragment.java
+++ b/app/src/main/java/org/itxtech/daedalus/fragment/GlobalConfigFragment.java
@ -4,8 +4,8 @@ import android.content.Intent;
 import android.os.Build;
 import android.os.Bundle;
 import android.preference.*;
-import android.support.design.widget.Snackbar;
 import android.view.View;
+import com.google.android.material.snackbar.Snackbar;
 import org.itxtech.daedalus.Daedalus;
 import org.itxtech.daedalus.R;
 import org.itxtech.daedalus.activity.MainActivity;
--- a/app/src/main/java/org/itxtech/daedalus/fragment/LogFragment.java
+++ b/app/src/main/java/org/itxtech/daedalus/fragment/LogFragment.java
@ -1,13 +1,13 @@
 package org.itxtech.daedalus.fragment;

 import android.os.Bundle;
-import android.support.design.widget.Snackbar;
-import android.support.v7.widget.Toolbar;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
+import androidx.appcompat.widget.Toolbar;
+import com.google.android.material.snackbar.Snackbar;
 import org.itxtech.daedalus.Daedalus;
 import org.itxtech.daedalus.R;
 import org.itxtech.daedalus.util.Logger;
--- a/app/src/main/java/org/itxtech/daedalus/fragment/RuleConfigFragment.java
+++ b/app/src/main/java/org/itxtech/daedalus/fragment/RuleConfigFragment.java
@ -11,11 +11,11 @@ import android.os.Handler;
 import android.os.Message;
 import android.preference.EditTextPreference;
 import android.preference.ListPreference;
-import android.support.design.widget.Snackbar;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
+import com.google.android.material.snackbar.Snackbar;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
--- a/app/src/main/java/org/itxtech/daedalus/fragment/RulesFragment.java
+++ b/app/src/main/java/org/itxtech/daedalus/fragment/RulesFragment.java
@ -2,18 +2,18 @@ package org.itxtech.daedalus.fragment;

 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.design.widget.FloatingActionButton;
-import android.support.design.widget.Snackbar;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.Toolbar;
-import android.support.v7.widget.helper.ItemTouchHelper;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.appcompat.widget.Toolbar;
+import androidx.recyclerview.widget.ItemTouchHelper;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import com.google.android.material.snackbar.Snackbar;
 import org.itxtech.daedalus.Daedalus;
 import org.itxtech.daedalus.R;
 import org.itxtech.daedalus.activity.ConfigActivity;
--- a/app/src/main/java/org/itxtech/daedalus/fragment/ToolbarFragment.java
+++ b/app/src/main/java/org/itxtech/daedalus/fragment/ToolbarFragment.java
@ -2,10 +2,10 @@ package org.itxtech.daedalus.fragment;

 import android.app.Fragment;
 import android.os.Bundle;
-import android.support.design.widget.NavigationView;
-import android.support.v7.widget.Toolbar;
 import android.view.Menu;
 import android.view.View;
+import androidx.appcompat.widget.Toolbar;
+import com.google.android.material.navigation.NavigationView;
 import org.itxtech.daedalus.R;

 /**
--- a/app/src/main/java/org/itxtech/daedalus/provider/HttpsProvider.java
+++ b/app/src/main/java/org/itxtech/daedalus/provider/HttpsProvider.java
@ -3,11 +3,11 @@ package org.itxtech.daedalus.provider;
 import android.annotation.TargetApi;
 import android.os.Build;
 import android.os.ParcelFileDescriptor;
-import android.support.annotation.NonNull;
 import android.system.Os;
 import android.system.OsConstants;
 import android.system.StructPollfd;
 import android.util.Log;
+import androidx.annotation.NonNull;
 import org.itxtech.daedalus.Daedalus;
 import org.itxtech.daedalus.service.DaedalusVpnService;
 import org.itxtech.daedalus.util.Logger;
--- a/app/src/main/java/org/itxtech/daedalus/provider/TcpProvider.java
+++ b/app/src/main/java/org/itxtech/daedalus/provider/TcpProvider.java
@ -3,12 +3,12 @@ package org.itxtech.daedalus.provider;
 import android.annotation.TargetApi;
 import android.os.Build;
 import android.os.ParcelFileDescriptor;
-import android.support.annotation.NonNull;
 import android.system.ErrnoException;
 import android.system.Os;
 import android.system.OsConstants;
 import android.system.StructPollfd;
 import android.util.Log;
+import androidx.annotation.NonNull;
 import org.itxtech.daedalus.service.DaedalusVpnService;
 import org.itxtech.daedalus.util.Logger;
 import org.itxtech.daedalus.util.server.DNSServerHelper;
--- a/app/src/main/java/org/itxtech/daedalus/provider/UdpProvider.java
+++ b/app/src/main/java/org/itxtech/daedalus/provider/UdpProvider.java
@ -3,11 +3,11 @@ package org.itxtech.daedalus.provider;
 import android.annotation.TargetApi;
 import android.os.Build;
 import android.os.ParcelFileDescriptor;
-import android.support.annotation.NonNull;
 import android.system.Os;
 import android.system.OsConstants;
 import android.system.StructPollfd;
 import android.util.Log;
+import androidx.annotation.NonNull;
 import org.itxtech.daedalus.Daedalus;
 import org.itxtech.daedalus.service.DaedalusVpnService;
 import org.itxtech.daedalus.util.Logger;
--- a/app/src/main/java/org/itxtech/daedalus/service/DaedalusTileService.java
+++ b/app/src/main/java/org/itxtech/daedalus/service/DaedalusTileService.java
@ -3,7 +3,7 @@ package org.itxtech.daedalus.service;
 import android.os.Build;
 import android.service.quicksettings.Tile;
 import android.service.quicksettings.TileService;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.RequiresApi;
 import org.itxtech.daedalus.Daedalus;
 import org.itxtech.daedalus.R;

--- a/app/src/main/java/org/itxtech/daedalus/service/DaedalusVpnService.java
+++ b/app/src/main/java/org/itxtech/daedalus/service/DaedalusVpnService.java
@ -10,9 +10,9 @@ import android.content.Intent;
 import android.net.VpnService;
 import android.os.Build;
 import android.os.ParcelFileDescriptor;
-import android.support.v4.app.NotificationCompat;
 import android.system.OsConstants;
 import android.util.Log;
+import androidx.core.app.NotificationCompat;
 import org.itxtech.daedalus.Daedalus;
 import org.itxtech.daedalus.R;
 import org.itxtech.daedalus.activity.MainActivity;
--- a/app/src/main/java/org/itxtech/daedalus/widget/ClearAutoCompleteTextView.java
+++ b/app/src/main/java/org/itxtech/daedalus/widget/ClearAutoCompleteTextView.java
@ -2,14 +2,14 @@ package org.itxtech.daedalus.widget;

 import android.content.Context;
 import android.graphics.drawable.Drawable;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.graphics.drawable.DrawableCompat;
-import android.support.v7.widget.AppCompatAutoCompleteTextView;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.View;
+import androidx.appcompat.widget.AppCompatAutoCompleteTextView;
+import androidx.core.content.ContextCompat;
+import androidx.core.graphics.drawable.DrawableCompat;
 import org.itxtech.daedalus.R;

 /**
--- a/app/src/main/res/layout/activity_config.xml
+++ b/app/src/main/res/layout/activity_config.xml
@ -1,5 +1,5 @@
 <?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"
        xmlns:tools="http://schemas.android.com/tools"
@ -7,19 +7,19 @@
        android:layout_height="match_parent"
        android:fitsSystemWindows="true">

-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
            android:layout_height="wrap_content"
            android:layout_width="match_parent"
            android:theme="@style/AppTheme.AppBarOverlay">

-        <android.support.v7.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar
                android:id="@+id/toolbar_config"
                android:layout_width="match_parent"
                android:layout_height="?android:attr/actionBarSize"
                android:background="@color/colorPrimary"
                app:popupTheme="@style/AppTheme.PopupOverlay"/>

-    </android.support.design.widget.AppBarLayout>
+    </com.google.android.material.appbar.AppBarLayout>

    <RelativeLayout
            android:id="@+id/id_config"
@ -29,4 +29,4 @@
            tools:context="org.itxtech.daedalus.activity.ConfigActivity">

    </RelativeLayout>
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.DrawerLayout
+<androidx.drawerlayout.widget.DrawerLayout
        xmlns:android="http://schemas.android.com/apk/res/android"
        xmlns:app="http://schemas.android.com/apk/res-auto"
        xmlns:tools="http://schemas.android.com/tools"
@ -14,7 +14,7 @@
            android:layout_width="match_parent"
            android:layout_height="match_parent"/>

-    <android.support.design.widget.NavigationView
+    <com.google.android.material.navigation.NavigationView
            android:id="@+id/nav_view"
            android:layout_width="wrap_content"
            android:layout_height="match_parent"
@ -22,4 +22,4 @@
            android:fitsSystemWindows="true"
            app:headerLayout="@layout/nav_header_main"
            app:menu="@menu/activity_main_drawer"/>
-</android.support.v4.widget.DrawerLayout>
+</androidx.drawerlayout.widget.DrawerLayout>
--- a/app/src/main/res/layout/app_bar_main.xml
+++ b/app/src/main/res/layout/app_bar_main.xml
@ -1,5 +1,5 @@
 <?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"
        xmlns:tools="http://schemas.android.com/tools"
@ -7,21 +7,21 @@
        android:layout_height="match_parent"
        android:fitsSystemWindows="true">

-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
            android:layout_height="wrap_content"
            android:layout_width="match_parent"
            android:theme="@style/AppTheme.AppBarOverlay">

-        <android.support.v7.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar
                android:id="@+id/toolbar"
                android:layout_width="match_parent"
                android:layout_height="?android:attr/actionBarSize"
                android:background="@color/colorPrimary"
                app:popupTheme="@style/AppTheme.PopupOverlay"/>

-    </android.support.design.widget.AppBarLayout>
+    </com.google.android.material.appbar.AppBarLayout>

-    <android.support.design.widget.CoordinatorLayout
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
            android:id="@+id/id_content"
            android:layout_width="match_parent"
            android:layout_height="match_parent"
@ -29,4 +29,4 @@
            tools:context=".activity.MainActivity"
            tools:showIn="@layout/app_bar_main"/>

-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
--- a/app/src/main/res/layout/card_rule.xml
+++ b/app/src/main/res/layout/card_rule.xml
@ -3,7 +3,7 @@
             xmlns:app="http://schemas.android.com/apk/res-auto"
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
-    <android.support.v7.widget.CardView
+    <androidx.cardview.widget.CardView
            android:layout_height="wrap_content"
            android:layout_width="match_parent"
            android:layout_gravity="center_horizontal"
@ -56,5 +56,5 @@
                          android:textAppearance="?android:attr/textAppearanceSmall"/>
            </RelativeLayout>
        </LinearLayout>
-    </android.support.v7.widget.CardView>
+    </androidx.cardview.widget.CardView>
 </FrameLayout>
--- a/app/src/main/res/layout/card_server.xml
+++ b/app/src/main/res/layout/card_server.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.CardView
+<androidx.cardview.widget.CardView
        xmlns:android="http://schemas.android.com/apk/res/android"
        xmlns:app="http://schemas.android.com/apk/res-auto"
        android:layout_height="wrap_content"
@ -38,4 +38,4 @@
                android:layout_alignParentStart="true"/>

    </RelativeLayout>
-</android.support.v7.widget.CardView>
+</androidx.cardview.widget.CardView>
--- a/app/src/main/res/layout/fragment_dns_servers.xml
+++ b/app/src/main/res/layout/fragment_dns_servers.xml
@ -1,11 +1,11 @@
 <?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"
        android:id="@+id/fragment_dns_servers"
        android:layout_width="match_parent"
        android:layout_height="match_parent">

-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
            android:id="@+id/recyclerView_dns_servers"
            android:layout_width="match_parent"
            android:layout_height="match_parent"
@ -14,7 +14,7 @@
            android:layout_alignParentLeft="true"
            android:layout_alignParentStart="true"/>

-    <android.support.design.widget.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
            android:id="@+id/fab_add_server"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
@ -23,4 +23,4 @@
            android:src="@drawable/ic_note_add"
            android:tint="#FFFFFF"/>

-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
--- a/app/src/main/res/layout/fragment_main.xml
+++ b/app/src/main/res/layout/fragment_main.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.percent.PercentRelativeLayout
+<androidx.percentlayout.widget.PercentRelativeLayout
        xmlns:android="http://schemas.android.com/apk/res/android"
        xmlns:tools="http://schemas.android.com/tools"
        xmlns:app="http://schemas.android.com/apk/res-auto"
@ -50,4 +50,4 @@
            android:id="@+id/button_activate"
            app:layout_marginTopPercent="10%"
            android:layout_alignTop="@+id/textView_notice" android:layout_centerHorizontal="true"/>
-</android.support.percent.PercentRelativeLayout>
+</androidx.percentlayout.widget.PercentRelativeLayout>
--- a/app/src/main/res/layout/fragment_rules.xml
+++ b/app/src/main/res/layout/fragment_rules.xml
@ -1,11 +1,11 @@
 <?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"
        android:id="@+id/fragment_rules"
        android:layout_width="match_parent"
        android:layout_height="match_parent">

-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
            android:id="@+id/recyclerView_rules"
            android:layout_width="match_parent"
            android:layout_height="match_parent"
@ -14,7 +14,7 @@
            android:layout_alignParentLeft="true"
            android:layout_alignParentStart="true"/>

-    <android.support.design.widget.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
            android:id="@+id/fab_add_rule"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
@ -23,4 +23,4 @@
            android:src="@drawable/ic_note_add"
            android:tint="#FFFFFF"/>

-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
--- a/app/src/main/res/layout/fragment_settings.xml
+++ b/app/src/main/res/layout/fragment_settings.xml
@ -1,4 +1,4 @@
-<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"
        xmlns:tools="http://schemas.android.com/tools"
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -71,7 +71,7 @@
    <string name="settings_dns_tcp">TCP</string>
    <string name="settings_dns_udp">UDP</string>
    <string name="settings_dns_tls">TLS</string>
-    <string name="settings_dns_https_ietf">HTTPS (IETF draft)</string>
+    <string name="settings_dns_https_ietf">HTTPS (RFC8484)</string>
    <string name="settings_dns_https_json">HTTPS (Google JSON)</string>

    <string name="settings_rule_name">Rule Name</string>
--- a/build.gradle
+++ b/build.gradle
@ -9,7 +9,7 @@ buildscript {
        }
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.4'
+        classpath 'com.android.tools.build:gradle:3.2.1'
        classpath 'com.google.gms:google-services:4.0.1'
        classpath 'io.fabric.tools:gradle:1.25.4'

--- a/gradle.properties
+++ b/gradle.properties
@ -6,6 +6,8 @@
 # http://www.gradle.org/docs/current/userguide/build_environment.html
 # 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.
 # This option should only be used with decoupled projects. More details, visit