diff --git a/ApiDemo/build.gradle b/ApiDemo/build.gradle
index 60df3da..2c1938d 100644
--- a/ApiDemo/build.gradle
+++ b/ApiDemo/build.gradle
@@ -1,16 +1,16 @@
 apply plugin: 'com.android.application'
 apply plugin: 'org.greenrobot.greendao'
 android {
-    compileSdkVersion 27
-    buildToolsVersion '27.0.3'
+    compileSdkVersion 28
+    buildToolsVersion '28.0.3'
     defaultConfig {
         applicationId "com.api.demo"
         minSdkVersion 14
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
         //指定EventBus加速用的Index2
         javaCompileOptions {
             annotationProcessorOptions {
@@ -52,6 +52,11 @@ android {
         targetGenDir 'src/main/java' //生成源文件的路径。默认源文件目录是在build目录中的(build/generated/source/greendao)
     }
 
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
     lintOptions {
         abortOnError false
     }
@@ -59,14 +64,17 @@ android {
 
 dependencies {
     api fileTree(dir: 'libs', include: ['*.jar'])
-    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
+    androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+
     testImplementation 'junit:junit:4.12'
-    api 'com.android.support:appcompat-v7:27.1.1'
-    api 'com.android.support:design:27.1.1'
-    api 'com.android.support:recyclerview-v7:27.1.1'
-    api 'com.android.support:cardview-v7:27.1.1'
+    api 'androidx.appcompat:appcompat:1.1.0'
+    api 'com.google.android.material:material:1.1.0'
+    api 'androidx.recyclerview:recyclerview:1.1.0'
+    api 'androidx.cardview:cardview:1.0.0'
 
     //依赖Devring库
     //该库中已添加了Dagger2，Retrofit2，RxJava2，RxAndroid2，RxLifeCycle2，RxPermission2的依赖，不必重复添加。
@@ -77,16 +85,16 @@ dependencies {
     }
 
     //══════════════════════资源绑定(ButterKnife)开始══════════════════════
-    api 'com.jakewharton:butterknife:8.8.1'
-    annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'//用于butterknife在编译时根据注解生成相关文件
+    api 'com.jakewharton:butterknife:10.0.0'
+    annotationProcessor 'com.jakewharton:butterknife-compiler:10.0.0'//用于butterknife在编译时根据注解生成相关文件
     //══════════════════════资源绑定(ButterKnife)结束══════════════════════
 
     //══════════════════════图片加载开始══════════════════════
     //Fresco
     //为了演示如何使用Fresco替换掉DevRing中默认的Glide，需添加Fresco的相关依赖
     //Fresco体积较大，如果对图片加载要求不高，建议使用Glide
-    api 'com.facebook.fresco:fresco:1.5.0'
-    api 'com.facebook.fresco:animated-gif:1.5.0' //用于Fresco加载gif动图
+    api 'com.facebook.fresco:fresco:1.13.0'
+    api 'com.facebook.fresco:animated-gif:1.13.0' //用于Fresco加载gif动图
     api 'com.facebook.fresco:imagepipeline-okhttp3:1.3.0'//用于替换fresco的网络加载为okhttp
     api 'jp.wasabeef:fresco-processors:2.1.0@aar'//用于提供fresco的各种图片变换
     //══════════════════════图片加载结束══════════════════════
diff --git a/ApiDemo/src/androidTest/java/com/api/demo/ExampleInstrumentedTest.java b/ApiDemo/src/androidTest/java/com/api/demo/ExampleInstrumentedTest.java
index 5b9b558..479fc1f 100644
--- a/ApiDemo/src/androidTest/java/com/api/demo/ExampleInstrumentedTest.java
+++ b/ApiDemo/src/androidTest/java/com/api/demo/ExampleInstrumentedTest.java
@@ -1,8 +1,8 @@
 package com.api.demo;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -19,7 +19,7 @@ public class ExampleInstrumentedTest {
     @Test
     public void useAppContext() throws Exception {
         // Context of the app under test.
-        Context appContext = InstrumentationRegistry.getTargetContext();
+        Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
 
         assertEquals("com.api.demo", appContext.getPackageName());
     }
diff --git a/ApiDemo/src/main/java/com/api/demo/MainActivity.java b/ApiDemo/src/main/java/com/api/demo/MainActivity.java
index 4fe53d5..c34a42b 100644
--- a/ApiDemo/src/main/java/com/api/demo/MainActivity.java
+++ b/ApiDemo/src/main/java/com/api/demo/MainActivity.java
@@ -2,7 +2,7 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.KeyEvent;
 import android.view.View;
 
diff --git a/ApiDemo/src/main/java/com/api/demo/bus/BusActivityA.java b/ApiDemo/src/main/java/com/api/demo/bus/BusActivityA.java
index 6e6bdc7..6277b5a 100644
--- a/ApiDemo/src/main/java/com/api/demo/bus/BusActivityA.java
+++ b/ApiDemo/src/main/java/com/api/demo/bus/BusActivityA.java
@@ -2,7 +2,7 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.widget.TextView;
 
diff --git a/ApiDemo/src/main/java/com/api/demo/bus/BusActivityB.java b/ApiDemo/src/main/java/com/api/demo/bus/BusActivityB.java
index ce9b1b3..ddd62d7 100644
--- a/ApiDemo/src/main/java/com/api/demo/bus/BusActivityB.java
+++ b/ApiDemo/src/main/java/com/api/demo/bus/BusActivityB.java
@@ -1,7 +1,7 @@
 package com.api.demo.bus;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.widget.TextView;
 
diff --git a/ApiDemo/src/main/java/com/api/demo/db/DBActivity.java b/ApiDemo/src/main/java/com/api/demo/db/DBActivity.java
index c7f00bb..2d5e142 100644
--- a/ApiDemo/src/main/java/com/api/demo/db/DBActivity.java
+++ b/ApiDemo/src/main/java/com/api/demo/db/DBActivity.java
@@ -1,9 +1,9 @@
 package com.api.demo.db;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.Button;
diff --git a/ApiDemo/src/main/java/com/api/demo/db/QueryResultAdapter.java b/ApiDemo/src/main/java/com/api/demo/db/QueryResultAdapter.java
index e6a547b..9cb63c0 100644
--- a/ApiDemo/src/main/java/com/api/demo/db/QueryResultAdapter.java
+++ b/ApiDemo/src/main/java/com/api/demo/db/QueryResultAdapter.java
@@ -1,6 +1,6 @@
 package com.api.demo.db;
 
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/ApiDemo/src/main/java/com/api/demo/db/greendao/GreenDBManager.java b/ApiDemo/src/main/java/com/api/demo/db/greendao/GreenDBManager.java
index 8e8ecb3..ccafa84 100644
--- a/ApiDemo/src/main/java/com/api/demo/db/greendao/GreenDBManager.java
+++ b/ApiDemo/src/main/java/com/api/demo/db/greendao/GreenDBManager.java
@@ -1,6 +1,6 @@
 package com.api.demo.db.greendao;
 
-import android.support.v4.util.SimpleArrayMap;
+import androidx.collection.SimpleArrayMap;
 
 import com.api.demo.db.User;
 import com.ljy.devring.DevRing;
diff --git a/ApiDemo/src/main/java/com/api/demo/db/nativedao/NativeDBManager.java b/ApiDemo/src/main/java/com/api/demo/db/nativedao/NativeDBManager.java
index b1c063e..af4b660 100644
--- a/ApiDemo/src/main/java/com/api/demo/db/nativedao/NativeDBManager.java
+++ b/ApiDemo/src/main/java/com/api/demo/db/nativedao/NativeDBManager.java
@@ -1,6 +1,6 @@
 package com.api.demo.db.nativedao;
 
-import android.support.v4.util.SimpleArrayMap;
+import androidx.collection.SimpleArrayMap;
 
 import com.api.demo.db.User;
 import com.ljy.devring.DevRing;
diff --git a/ApiDemo/src/main/java/com/api/demo/http/HttpActivity.java b/ApiDemo/src/main/java/com/api/demo/http/HttpActivity.java
index 13ff3cb..003e07b 100644
--- a/ApiDemo/src/main/java/com/api/demo/http/HttpActivity.java
+++ b/ApiDemo/src/main/java/com/api/demo/http/HttpActivity.java
@@ -1,7 +1,7 @@
 package com.api.demo.http;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.widget.ProgressBar;
 import android.widget.TextView;
diff --git a/ApiDemo/src/main/java/com/api/demo/image/FrescoManager.java b/ApiDemo/src/main/java/com/api/demo/image/FrescoManager.java
index 11394a5..685693d 100644
--- a/ApiDemo/src/main/java/com/api/demo/image/FrescoManager.java
+++ b/ApiDemo/src/main/java/com/api/demo/image/FrescoManager.java
@@ -4,7 +4,7 @@
 import android.graphics.Bitmap;
 import android.net.Uri;
 import android.os.Build;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.widget.ImageView;
 
 import com.facebook.cache.disk.DiskCacheConfig;
diff --git a/ApiDemo/src/main/java/com/api/demo/image/ImageActivity.java b/ApiDemo/src/main/java/com/api/demo/image/ImageActivity.java
index a81e705..8658b0a 100644
--- a/ApiDemo/src/main/java/com/api/demo/image/ImageActivity.java
+++ b/ApiDemo/src/main/java/com/api/demo/image/ImageActivity.java
@@ -2,7 +2,7 @@
 
 import android.graphics.Bitmap;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.widget.ImageView;
 
diff --git a/ApiDemo/src/main/java/com/api/demo/other/OtherActivity.java b/ApiDemo/src/main/java/com/api/demo/other/OtherActivity.java
index c39f45f..2af4f5d 100644
--- a/ApiDemo/src/main/java/com/api/demo/other/OtherActivity.java
+++ b/ApiDemo/src/main/java/com/api/demo/other/OtherActivity.java
@@ -2,7 +2,7 @@
 
 import android.Manifest;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 
 import com.api.demo.R;
diff --git a/ApiDemo/src/main/java/com/api/demo/util/UtilActivity.java b/ApiDemo/src/main/java/com/api/demo/util/UtilActivity.java
index 55fe889..4052a0c 100644
--- a/ApiDemo/src/main/java/com/api/demo/util/UtilActivity.java
+++ b/ApiDemo/src/main/java/com/api/demo/util/UtilActivity.java
@@ -1,7 +1,7 @@
 package com.api.demo.util;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 
 import com.api.demo.R;
diff --git a/ApiDemo/src/main/res/layout/activity_bus_a.xml b/ApiDemo/src/main/res/layout/activity_bus_a.xml
index e88a973..400be20 100644
--- a/ApiDemo/src/main/res/layout/activity_bus_a.xml
+++ b/ApiDemo/src/main/res/layout/activity_bus_a.xml
@@ -1,4 +1,4 @@
-<android.support.v4.widget.NestedScrollView
+<androidx.core.widget.NestedScrollView
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
@@ -17,7 +17,7 @@
             android:layout_margin="10dp"
             android:text="事件总线模块的配置请到ApiApplication类或使用文档中查看。\n 关于普通事件和粘性事件等介绍可以到我博客中查看。"/>
 
-        <android.support.v7.widget.CardView
+        <androidx.cardview.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="10dp"
@@ -45,9 +45,9 @@
                     />
             </LinearLayout>
 
-        </android.support.v7.widget.CardView>
+        </androidx.cardview.widget.CardView>
 
-        <android.support.v7.widget.CardView
+        <androidx.cardview.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="10dp"
@@ -90,7 +90,7 @@
 
             </LinearLayout>
 
-        </android.support.v7.widget.CardView>
+        </androidx.cardview.widget.CardView>
     </LinearLayout>
 
-</android.support.v4.widget.NestedScrollView>
\ No newline at end of file
+</androidx.core.widget.NestedScrollView>
\ No newline at end of file
diff --git a/ApiDemo/src/main/res/layout/activity_bus_b.xml b/ApiDemo/src/main/res/layout/activity_bus_b.xml
index 79769da..4ce6b22 100644
--- a/ApiDemo/src/main/res/layout/activity_bus_b.xml
+++ b/ApiDemo/src/main/res/layout/activity_bus_b.xml
@@ -1,4 +1,4 @@
-<android.support.v4.widget.NestedScrollView
+<androidx.core.widget.NestedScrollView
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
@@ -11,7 +11,7 @@
         android:orientation="vertical"
         >
 
-        <android.support.v7.widget.CardView
+        <androidx.cardview.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="10dp"
@@ -41,9 +41,9 @@
 
             </LinearLayout>
 
-        </android.support.v7.widget.CardView>
+        </androidx.cardview.widget.CardView>
 
-        <android.support.v7.widget.CardView
+        <androidx.cardview.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="10dp"
@@ -73,7 +73,7 @@
 
             </LinearLayout>
 
-        </android.support.v7.widget.CardView>
+        </androidx.cardview.widget.CardView>
     </LinearLayout>
 
-</android.support.v4.widget.NestedScrollView>
\ No newline at end of file
+</androidx.core.widget.NestedScrollView>
\ No newline at end of file
diff --git a/ApiDemo/src/main/res/layout/activity_db.xml b/ApiDemo/src/main/res/layout/activity_db.xml
index 3d6ac06..e815841 100644
--- a/ApiDemo/src/main/res/layout/activity_db.xml
+++ b/ApiDemo/src/main/res/layout/activity_db.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.NestedScrollView
+<androidx.core.widget.NestedScrollView
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
@@ -18,7 +18,7 @@
             android:layout_margin="10dp"
             android:text="使用数据库模块前，请先在Application中设置数据库管理者。\n数据库管理者的实现以及更多增删改查的用法，请查看源码或使用文档。"/>
 
-        <android.support.v7.widget.CardView
+        <androidx.cardview.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginLeft="10dp"
@@ -48,7 +48,7 @@
                     android:textSize="14sp"
                     />
 
-                <android.support.v7.widget.RecyclerView
+                <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/rv_result"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -57,9 +57,9 @@
 
             </LinearLayout>
 
-        </android.support.v7.widget.CardView>
+        </androidx.cardview.widget.CardView>
 
-        <android.support.v7.widget.CardView
+        <androidx.cardview.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="10dp"
@@ -121,9 +121,9 @@
                     android:text="插入数据"/>
             </LinearLayout>
 
-        </android.support.v7.widget.CardView>
+        </androidx.cardview.widget.CardView>
 
-        <android.support.v7.widget.CardView
+        <androidx.cardview.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="10dp"
@@ -176,9 +176,9 @@
                     />
             </LinearLayout>
 
-        </android.support.v7.widget.CardView>
+        </androidx.cardview.widget.CardView>
 
-        <android.support.v7.widget.CardView
+        <androidx.cardview.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="10dp"
@@ -208,9 +208,9 @@
                     />
             </LinearLayout>
 
-        </android.support.v7.widget.CardView>
+        </androidx.cardview.widget.CardView>
 
-        <android.support.v7.widget.CardView
+        <androidx.cardview.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="10dp"
@@ -267,7 +267,7 @@
 
             </LinearLayout>
 
-        </android.support.v7.widget.CardView>
+        </androidx.cardview.widget.CardView>
 
     </LinearLayout>
-</android.support.v4.widget.NestedScrollView>
\ No newline at end of file
+</androidx.core.widget.NestedScrollView>
\ No newline at end of file
diff --git a/ApiDemo/src/main/res/layout/activity_http.xml b/ApiDemo/src/main/res/layout/activity_http.xml
index be6d543..ecc3780 100644
--- a/ApiDemo/src/main/res/layout/activity_http.xml
+++ b/ApiDemo/src/main/res/layout/activity_http.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.NestedScrollView
+<androidx.core.widget.NestedScrollView
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
@@ -18,7 +18,7 @@
             android:layout_height="wrap_content"
             android:text="关于网络模块的配置请到ApiApplication类中查看。\n下面演示该模块的调用，具体请阅读使用文档。"/>
 
-        <android.support.v7.widget.CardView
+        <androidx.cardview.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="10dp"
@@ -54,9 +54,9 @@
                     />
             </LinearLayout>
 
-        </android.support.v7.widget.CardView>
+        </androidx.cardview.widget.CardView>
 
-        <android.support.v7.widget.CardView
+        <androidx.cardview.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="10dp"
@@ -130,9 +130,9 @@
                 </RelativeLayout>
             </LinearLayout>
 
-        </android.support.v7.widget.CardView>
+        </androidx.cardview.widget.CardView>
 
-        <android.support.v7.widget.CardView
+        <androidx.cardview.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="10dp"
@@ -206,9 +206,9 @@
                 </RelativeLayout>
             </LinearLayout>
 
-        </android.support.v7.widget.CardView>
+        </androidx.cardview.widget.CardView>
 
-        <android.support.v7.widget.CardView
+        <androidx.cardview.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="10dp"
@@ -243,7 +243,7 @@
                     />
             </LinearLayout>
 
-        </android.support.v7.widget.CardView>
+        </androidx.cardview.widget.CardView>
     </LinearLayout>
 
-</android.support.v4.widget.NestedScrollView>
+</androidx.core.widget.NestedScrollView>
diff --git a/ApiDemo/src/main/res/layout/activity_image.xml b/ApiDemo/src/main/res/layout/activity_image.xml
index 15d0f37..d2637db 100644
--- a/ApiDemo/src/main/res/layout/activity_image.xml
+++ b/ApiDemo/src/main/res/layout/activity_image.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.NestedScrollView
+<androidx.core.widget.NestedScrollView
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
@@ -18,7 +18,7 @@
             android:layout_height="wrap_content"
             android:text="关于图片模块的配置请到ApiApplication类中查看。\n下面演示该模块的调用，具体请阅读使用文档。"/>
 
-        <android.support.v7.widget.CardView
+        <androidx.cardview.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="10dp"
@@ -87,9 +87,9 @@
                 </LinearLayout>
             </LinearLayout>
 
-        </android.support.v7.widget.CardView>
+        </androidx.cardview.widget.CardView>
 
-        <android.support.v7.widget.CardView
+        <androidx.cardview.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="10dp"
@@ -173,9 +173,9 @@
                     android:text="可同时应用多个条件效果。\n更多设置请查看LoadOption类或使用文档"/>
             </LinearLayout>
 
-        </android.support.v7.widget.CardView>
+        </androidx.cardview.widget.CardView>
 
-        <android.support.v7.widget.CardView
+        <androidx.cardview.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="10dp"
@@ -211,9 +211,9 @@
                     />
             </LinearLayout>
 
-        </android.support.v7.widget.CardView>
+        </androidx.cardview.widget.CardView>
 
-        <android.support.v7.widget.CardView
+        <androidx.cardview.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="10dp"
@@ -249,9 +249,9 @@
                     />
             </LinearLayout>
 
-        </android.support.v7.widget.CardView>
+        </androidx.cardview.widget.CardView>
 
-        <android.support.v7.widget.CardView
+        <androidx.cardview.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="10dp"
@@ -307,7 +307,7 @@
 
             </LinearLayout>
 
-        </android.support.v7.widget.CardView>
+        </androidx.cardview.widget.CardView>
 
     </LinearLayout>
-</android.support.v4.widget.NestedScrollView>
\ No newline at end of file
+</androidx.core.widget.NestedScrollView>
\ No newline at end of file
diff --git a/ApiDemo/src/main/res/layout/activity_other.xml b/ApiDemo/src/main/res/layout/activity_other.xml
index 0a3937c..8774ee1 100644
--- a/ApiDemo/src/main/res/layout/activity_other.xml
+++ b/ApiDemo/src/main/res/layout/activity_other.xml
@@ -1,4 +1,4 @@
-<android.support.v4.widget.NestedScrollView
+<androidx.core.widget.NestedScrollView
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
@@ -17,7 +17,7 @@
             android:layout_margin="10dp"
             android:text="其他模块目前包括：缓存、权限管理、页面基类、Activity管理 \n具体使用请查看源码及使用文档"/>
 
-        <android.support.v7.widget.CardView
+        <androidx.cardview.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="10dp"
@@ -44,9 +44,9 @@
                     />
             </LinearLayout>
 
-        </android.support.v7.widget.CardView>
+        </androidx.cardview.widget.CardView>
 
-        <android.support.v7.widget.CardView
+        <androidx.cardview.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="10dp"
@@ -96,9 +96,9 @@
 
             </LinearLayout>
 
-        </android.support.v7.widget.CardView>
+        </androidx.cardview.widget.CardView>
 
-        <android.support.v7.widget.CardView
+        <androidx.cardview.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="10dp"
@@ -132,9 +132,9 @@
                     />
             </LinearLayout>
 
-        </android.support.v7.widget.CardView>
+        </androidx.cardview.widget.CardView>
 
-        <android.support.v7.widget.CardView
+        <androidx.cardview.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="10dp"
@@ -168,7 +168,7 @@
                     />
             </LinearLayout>
 
-        </android.support.v7.widget.CardView>
+        </androidx.cardview.widget.CardView>
     </LinearLayout>
 
-</android.support.v4.widget.NestedScrollView>
\ No newline at end of file
+</androidx.core.widget.NestedScrollView>
\ No newline at end of file
diff --git a/ApiDemo/src/main/res/layout/activity_util.xml b/ApiDemo/src/main/res/layout/activity_util.xml
index 655fbd4..6dbb7fa 100644
--- a/ApiDemo/src/main/res/layout/activity_util.xml
+++ b/ApiDemo/src/main/res/layout/activity_util.xml
@@ -1,4 +1,4 @@
-<android.support.v4.widget.NestedScrollView
+<androidx.core.widget.NestedScrollView
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
@@ -17,7 +17,7 @@
             android:layout_margin="10dp"
             android:text="工具类模块有：Log、Toast、各常用的工具类 \n具体使用请查看源码及使用文档"/>
 
-        <android.support.v7.widget.CardView
+        <androidx.cardview.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="10dp"
@@ -67,9 +67,9 @@
 
             </LinearLayout>
 
-        </android.support.v7.widget.CardView>
+        </androidx.cardview.widget.CardView>
 
-        <android.support.v7.widget.CardView
+        <androidx.cardview.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="10dp"
@@ -96,9 +96,9 @@
                     />
             </LinearLayout>
 
-        </android.support.v7.widget.CardView>
+        </androidx.cardview.widget.CardView>
 
-        <android.support.v7.widget.CardView
+        <androidx.cardview.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="10dp"
@@ -174,7 +174,7 @@
                     />
             </LinearLayout>
 
-        </android.support.v7.widget.CardView>
+        </androidx.cardview.widget.CardView>
     </LinearLayout>
 
-</android.support.v4.widget.NestedScrollView>
\ No newline at end of file
+</androidx.core.widget.NestedScrollView>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index aa5834a..21e457d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.2'
+        classpath 'com.android.tools.build:gradle:3.2.0'
         //用于greendao
         classpath 'org.greenrobot:greendao-gradle-plugin:3.2.0'
         //用于上传至Jcenter
diff --git a/devring/build.gradle b/devring/build.gradle
index dcacad5..5f702d1 100644
--- a/devring/build.gradle
+++ b/devring/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 27
-    buildToolsVersion '27.0.3'
+    compileSdkVersion 28
+    buildToolsVersion '28.0.3'
 
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion 23
+        targetSdkVersion 28
         versionCode 25
         versionName "1.1.8"
 
@@ -19,6 +19,11 @@ android {
         }
     }
 
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
     lintOptions {
         abortOnError false
     }
@@ -48,9 +53,12 @@ dependencies {
     annotationProcessor 'com.google.dagger:dagger-compiler:2.25.2'
 
     //Glide图片加载
-    api 'com.github.bumptech.glide:glide:4.4.0'
+    api 'com.github.bumptech.glide:glide:4.9.0'
     api 'jp.wasabeef:glide-transformations:3.1.1@aar'//图片转换工具
-    annotationProcessor 'com.github.bumptech.glide:compiler:4.4.0'
+    annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0'
+    //解决Glide兼容问题
+    implementation "com.android.support:support-annotations:28.0.0"
+    annotationProcessor "com.android.support:support-annotations:28.0.0"
 
     //greenDAO数据库
     api 'org.greenrobot:greendao:3.2.2'
diff --git a/devring/src/main/AndroidManifest.xml b/devring/src/main/AndroidManifest.xml
index 1562ef9..fa15460 100644
--- a/devring/src/main/AndroidManifest.xml
+++ b/devring/src/main/AndroidManifest.xml
@@ -9,7 +9,7 @@
                  android:supportsRtl="true">
 
         <provider
-            android:name="android.support.v4.content.FileProvider"
+            android:name="androidx.core.content.FileProvider"
             android:authorities="${applicationId}.android7.fileprovider"
             android:exported="false"
             android:grantUriPermissions="true">
diff --git a/devring/src/main/java/com/ljy/devring/base/activity/ActivityLifeCallback.java b/devring/src/main/java/com/ljy/devring/base/activity/ActivityLifeCallback.java
index f10ad78..31accd3 100644
--- a/devring/src/main/java/com/ljy/devring/base/activity/ActivityLifeCallback.java
+++ b/devring/src/main/java/com/ljy/devring/base/activity/ActivityLifeCallback.java
@@ -3,8 +3,8 @@
 import android.app.Activity;
 import android.app.Application;
 import android.os.Bundle;
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.util.SimpleArrayMap;
+import androidx.fragment.app.FragmentActivity;
+import androidx.collection.SimpleArrayMap;
 
 import com.ljy.devring.base.fragment.FragmentLifeCallback;
 
diff --git a/devring/src/main/java/com/ljy/devring/base/fragment/FragmentLife.java b/devring/src/main/java/com/ljy/devring/base/fragment/FragmentLife.java
index ae2e349..2767ce4 100644
--- a/devring/src/main/java/com/ljy/devring/base/fragment/FragmentLife.java
+++ b/devring/src/main/java/com/ljy/devring/base/fragment/FragmentLife.java
@@ -2,7 +2,7 @@
 
 import android.content.Context;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.view.View;
 import android.view.ViewGroup;
 
diff --git a/devring/src/main/java/com/ljy/devring/base/fragment/FragmentLifeCallback.java b/devring/src/main/java/com/ljy/devring/base/fragment/FragmentLifeCallback.java
index d03ddc0..687d34a 100644
--- a/devring/src/main/java/com/ljy/devring/base/fragment/FragmentLifeCallback.java
+++ b/devring/src/main/java/com/ljy/devring/base/fragment/FragmentLifeCallback.java
@@ -2,9 +2,9 @@
 
 import android.content.Context;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.util.SimpleArrayMap;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.collection.SimpleArrayMap;
 import android.view.View;
 
 import javax.inject.Inject;
diff --git a/devring/src/main/java/com/ljy/devring/base/fragment/IFragmentLife.java b/devring/src/main/java/com/ljy/devring/base/fragment/IFragmentLife.java
index e8f81ef..2dca638 100644
--- a/devring/src/main/java/com/ljy/devring/base/fragment/IFragmentLife.java
+++ b/devring/src/main/java/com/ljy/devring/base/fragment/IFragmentLife.java
@@ -2,7 +2,7 @@
 
 import android.content.Context;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.view.View;
 
 /**
diff --git a/devring/src/main/java/com/ljy/devring/cache/CacheManager.java b/devring/src/main/java/com/ljy/devring/cache/CacheManager.java
index e49f175..93f8d70 100644
--- a/devring/src/main/java/com/ljy/devring/cache/CacheManager.java
+++ b/devring/src/main/java/com/ljy/devring/cache/CacheManager.java
@@ -4,7 +4,7 @@
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.Process;
-import android.support.v4.util.SimpleArrayMap;
+import androidx.collection.SimpleArrayMap;
 
 import com.ljy.devring.cache.support.DiskCache;
 import com.ljy.devring.cache.support.MemoryCache;
diff --git a/devring/src/main/java/com/ljy/devring/cache/support/DiskCache.java b/devring/src/main/java/com/ljy/devring/cache/support/DiskCache.java
index a18b498..392ea8d 100644
--- a/devring/src/main/java/com/ljy/devring/cache/support/DiskCache.java
+++ b/devring/src/main/java/com/ljy/devring/cache/support/DiskCache.java
@@ -9,7 +9,7 @@
 import android.graphics.drawable.Drawable;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.json.JSONArray;
 import org.json.JSONObject;
diff --git a/devring/src/main/java/com/ljy/devring/db/support/IDBManager.java b/devring/src/main/java/com/ljy/devring/db/support/IDBManager.java
index c850eb0..c87e762 100644
--- a/devring/src/main/java/com/ljy/devring/db/support/IDBManager.java
+++ b/devring/src/main/java/com/ljy/devring/db/support/IDBManager.java
@@ -1,6 +1,6 @@
 package com.ljy.devring.db.support;
 
-import android.support.v4.util.SimpleArrayMap;
+import androidx.collection.SimpleArrayMap;
 
 /**
  * author:  ljy
diff --git a/devring/src/main/java/com/ljy/devring/db/support/MigrationHelper.java b/devring/src/main/java/com/ljy/devring/db/support/MigrationHelper.java
index 0cf76f8..c62129e 100644
--- a/devring/src/main/java/com/ljy/devring/db/support/MigrationHelper.java
+++ b/devring/src/main/java/com/ljy/devring/db/support/MigrationHelper.java
@@ -3,7 +3,7 @@
 import android.database.Cursor;
 import android.database.SQLException;
 import android.database.sqlite.SQLiteDatabase;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.text.TextUtils;
 import android.util.Log;
 
diff --git a/devring/src/main/java/com/ljy/devring/di/component/RingComponent.java b/devring/src/main/java/com/ljy/devring/di/component/RingComponent.java
index 7c5e7b6..d10a8a4 100644
--- a/devring/src/main/java/com/ljy/devring/di/component/RingComponent.java
+++ b/devring/src/main/java/com/ljy/devring/di/component/RingComponent.java
@@ -1,7 +1,7 @@
 package com.ljy.devring.di.component;
 
 import android.app.Application;
-import android.support.v4.util.SimpleArrayMap;
+import androidx.collection.SimpleArrayMap;
 
 import com.ljy.devring.DevRing;
 import com.ljy.devring.base.activity.ActivityLifeCallback;
diff --git a/devring/src/main/java/com/ljy/devring/di/module/OtherModule.java b/devring/src/main/java/com/ljy/devring/di/module/OtherModule.java
index 87a27fd..619e25d 100644
--- a/devring/src/main/java/com/ljy/devring/di/module/OtherModule.java
+++ b/devring/src/main/java/com/ljy/devring/di/module/OtherModule.java
@@ -1,7 +1,7 @@
 package com.ljy.devring.di.module;
 
 
-import android.support.v4.util.SimpleArrayMap;
+import androidx.collection.SimpleArrayMap;
 
 import com.ljy.devring.base.activity.ActivityLife;
 import com.ljy.devring.base.activity.IActivityLife;
diff --git a/devring/src/main/java/com/ljy/devring/di/module/RingModule.java b/devring/src/main/java/com/ljy/devring/di/module/RingModule.java
index a05e536..dcad31b 100644
--- a/devring/src/main/java/com/ljy/devring/di/module/RingModule.java
+++ b/devring/src/main/java/com/ljy/devring/di/module/RingModule.java
@@ -1,7 +1,7 @@
 package com.ljy.devring.di.module;
 
 import android.app.Application;
-import android.support.v4.util.SimpleArrayMap;
+import androidx.collection.SimpleArrayMap;
 import android.text.TextUtils;
 
 import com.ljy.devring.bus.EventBusManager;
diff --git a/devring/src/main/java/com/ljy/devring/http/support/interceptor/HttpProgressInterceptor.java b/devring/src/main/java/com/ljy/devring/http/support/interceptor/HttpProgressInterceptor.java
index c7cfa39..1fb616d 100644
--- a/devring/src/main/java/com/ljy/devring/http/support/interceptor/HttpProgressInterceptor.java
+++ b/devring/src/main/java/com/ljy/devring/http/support/interceptor/HttpProgressInterceptor.java
@@ -2,7 +2,7 @@
 
 import android.os.Handler;
 import android.os.Looper;
-import android.support.v4.util.SimpleArrayMap;
+import androidx.collection.SimpleArrayMap;
 import android.text.TextUtils;
 
 import com.ljy.devring.http.support.body.ProgressListener;
diff --git a/devring/src/main/java/com/ljy/devring/http/support/observer/UploadObserver.java b/devring/src/main/java/com/ljy/devring/http/support/observer/UploadObserver.java
index e94ea27..56118cc 100644
--- a/devring/src/main/java/com/ljy/devring/http/support/observer/UploadObserver.java
+++ b/devring/src/main/java/com/ljy/devring/http/support/observer/UploadObserver.java
@@ -1,7 +1,7 @@
 package com.ljy.devring.http.support.observer;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.ljy.devring.http.support.body.ProgressListener;
 import com.ljy.devring.http.support.throwable.HttpThrowable;
diff --git a/devring/src/main/java/com/ljy/devring/image/GlideManager.java b/devring/src/main/java/com/ljy/devring/image/GlideManager.java
index b26adc4..5236ad5 100644
--- a/devring/src/main/java/com/ljy/devring/image/GlideManager.java
+++ b/devring/src/main/java/com/ljy/devring/image/GlideManager.java
@@ -4,7 +4,7 @@
 import android.graphics.Bitmap;
 import android.os.Handler;
 import android.os.Looper;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.widget.ImageView;
 
 import com.bumptech.glide.Glide;
diff --git a/devring/src/main/java/com/ljy/devring/image/support/CircleBorderTransformation.java b/devring/src/main/java/com/ljy/devring/image/support/CircleBorderTransformation.java
index 702ab4d..a6f1adf 100644
--- a/devring/src/main/java/com/ljy/devring/image/support/CircleBorderTransformation.java
+++ b/devring/src/main/java/com/ljy/devring/image/support/CircleBorderTransformation.java
@@ -6,7 +6,7 @@
 import android.graphics.BitmapShader;
 import android.graphics.Canvas;
 import android.graphics.Paint;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;
 
diff --git a/devring/src/main/java/com/ljy/devring/image/support/GlideConfigModule.java b/devring/src/main/java/com/ljy/devring/image/support/GlideConfigModule.java
index fbdd1e2..a549132 100644
--- a/devring/src/main/java/com/ljy/devring/image/support/GlideConfigModule.java
+++ b/devring/src/main/java/com/ljy/devring/image/support/GlideConfigModule.java
@@ -1,7 +1,7 @@
 package com.ljy.devring.image.support;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.GlideBuilder;
diff --git a/devring/src/main/java/com/ljy/devring/image/support/OkHttpStreamFetcher.java b/devring/src/main/java/com/ljy/devring/image/support/OkHttpStreamFetcher.java
index ba31938..76459a8 100644
--- a/devring/src/main/java/com/ljy/devring/image/support/OkHttpStreamFetcher.java
+++ b/devring/src/main/java/com/ljy/devring/image/support/OkHttpStreamFetcher.java
@@ -1,7 +1,7 @@
 package com.ljy.devring.image.support;
 
 import android.os.Build;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.util.Log;
 
 import com.bumptech.glide.Priority;
diff --git a/devring/src/main/java/com/ljy/devring/other/PermissionManager.java b/devring/src/main/java/com/ljy/devring/other/PermissionManager.java
index 7dbedfd..b6133b6 100644
--- a/devring/src/main/java/com/ljy/devring/other/PermissionManager.java
+++ b/devring/src/main/java/com/ljy/devring/other/PermissionManager.java
@@ -1,7 +1,6 @@
 package com.ljy.devring.other;
 
-import android.app.Activity;
-import android.support.v4.app.FragmentActivity;
+import androidx.fragment.app.FragmentActivity;
 
 import com.ljy.devring.other.permission.PermissionListener;
 import com.tbruyelle.rxpermissions2.Permission;
diff --git a/devring/src/main/java/com/ljy/devring/other/RingLog.java b/devring/src/main/java/com/ljy/devring/other/RingLog.java
index abbc685..c08722f 100644
--- a/devring/src/main/java/com/ljy/devring/other/RingLog.java
+++ b/devring/src/main/java/com/ljy/devring/other/RingLog.java
@@ -1,7 +1,7 @@
 package com.ljy.devring.other;
 
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 
 import com.ljy.devring.other.log.BaseLog;
diff --git a/devring/src/main/java/com/ljy/devring/util/BarUtil.java b/devring/src/main/java/com/ljy/devring/util/BarUtil.java
index 253d122..daf65b2 100644
--- a/devring/src/main/java/com/ljy/devring/util/BarUtil.java
+++ b/devring/src/main/java/com/ljy/devring/util/BarUtil.java
@@ -5,8 +5,8 @@
 import android.content.Context;
 import android.graphics.Color;
 import android.os.Build;
-import android.support.annotation.ColorInt;
-import android.support.v4.widget.DrawerLayout;
+import androidx.annotation.ColorInt;
+import androidx.drawerlayout.widget.DrawerLayout;
 import android.util.DisplayMetrics;
 import android.view.Display;
 import android.view.Gravity;
diff --git a/devring/src/main/java/com/ljy/devring/util/FileUtil.java b/devring/src/main/java/com/ljy/devring/util/FileUtil.java
index 7a82d75..62fb686 100644
--- a/devring/src/main/java/com/ljy/devring/util/FileUtil.java
+++ b/devring/src/main/java/com/ljy/devring/util/FileUtil.java
@@ -342,9 +342,27 @@ public static String getFilesDir(Context context) {
         return context.getFilesDir().getAbsolutePath();
     }
 
-    //返回"/storage/emulated/0/Android/data/com.xxx.xxx/cache"目录
+
+    /** XieYos
+     *  2020年7月10日 修改方法使其可以 兼容AndroidX
+     * @param context
+     * @return  返回"/storage/emulated/0/Android/data/com.xxx.xxx/cache"目录
+     */
     public static String getExternalCacheDir(Context context) {
-        return context.getExternalCacheDir().getAbsolutePath();
+        String cachePath ;
+        try{
+            if (Environment.MEDIA_MOUNTED.equals(Environment.getExternalStorageState())
+                    || !Environment.isExternalStorageRemovable()) {
+                //外部存储可用
+                cachePath = context.getExternalCacheDir().getPath() ;
+            }else {
+                //外部存储不可用
+                cachePath = context.getCacheDir().getPath() ;
+            }
+        }catch (Exception ex){
+            cachePath = getExternalFilesDir(context,Environment.DIRECTORY_ALARMS);
+        }
+        return cachePath;
     }
 
     /**
@@ -378,7 +396,7 @@ public static Uri getUriForFile(Context context, File file) {
     }
 
     public static Uri getUriForFileAndroid7(Context context, File file) {
-        Uri fileUri = android.support.v4.content.FileProvider.getUriForFile(context, context.getPackageName() + ".android7.fileprovider", file);
+        Uri fileUri = androidx.core.content.FileProvider.getUriForFile(context, context.getPackageName() + ".android7.fileprovider", file);
         return fileUri;
     }
 
diff --git a/devring/src/main/java/com/ljy/devring/util/FontTypeUtil.java b/devring/src/main/java/com/ljy/devring/util/FontTypeUtil.java
index eae4191..bdb8dd6 100644
--- a/devring/src/main/java/com/ljy/devring/util/FontTypeUtil.java
+++ b/devring/src/main/java/com/ljy/devring/util/FontTypeUtil.java
@@ -3,7 +3,7 @@
 import android.app.Activity;
 import android.content.Context;
 import android.graphics.Typeface;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.text.TextUtils;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/devring/src/main/java/com/ljy/devring/util/ImageUtil.java b/devring/src/main/java/com/ljy/devring/util/ImageUtil.java
index aaedae2..17fd29d 100644
--- a/devring/src/main/java/com/ljy/devring/util/ImageUtil.java
+++ b/devring/src/main/java/com/ljy/devring/util/ImageUtil.java
@@ -16,7 +16,7 @@
 import android.renderscript.RSRuntimeException;
 import android.renderscript.RenderScript;
 import android.renderscript.ScriptIntrinsicBlur;
-import android.support.annotation.DrawableRes;
+import androidx.annotation.DrawableRes;
 
 import com.ljy.devring.other.RingLog;
 
diff --git a/devring/src/main/java/com/ljy/devring/util/Preconditions.java b/devring/src/main/java/com/ljy/devring/util/Preconditions.java
index cbc5f2a..5951793 100644
--- a/devring/src/main/java/com/ljy/devring/util/Preconditions.java
+++ b/devring/src/main/java/com/ljy/devring/util/Preconditions.java
@@ -15,7 +15,7 @@
  */
 package com.ljy.devring.util;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 /**
  * ================================================
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index d020514..2a5c368 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Jun 06 17:28:47 CST 2018
+#Fri Jul 10 01:53:06 CST 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-4.6-all.zip