diff --git a/app/build.gradle b/app/build.gradle
index 67f0b76..886cc9a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -24,8 +24,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.android.support:appcompat-v7:27.1.1'
-    implementation 'io.reactivex.rxjava2:rxjava:2.1.12'
-//    implementation 'me.jessyan:rxerrorhandler:2.1.1'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'io.reactivex.rxjava3:rxjava:3.1.7'
     implementation project(':rxerrorhandler')
 }
diff --git a/app/src/main/java/me/jessyan/rxerrorhandler/demo/MainActivity.java b/app/src/main/java/me/jessyan/rxerrorhandler/demo/MainActivity.java
index 46b704f..d931909 100644
--- a/app/src/main/java/me/jessyan/rxerrorhandler/demo/MainActivity.java
+++ b/app/src/main/java/me/jessyan/rxerrorhandler/demo/MainActivity.java
@@ -15,11 +15,11 @@
  */
 package me.jessyan.rxerrorhandler.demo;
 
+import android.app.Activity;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
 
-import io.reactivex.Flowable;
-import io.reactivex.Observable;
+import io.reactivex.rxjava3.core.Flowable;
+import io.reactivex.rxjava3.core.Observable;
 import me.jessyan.rxerrorhandler.core.RxErrorHandler;
 import me.jessyan.rxerrorhandler.handler.ErrorHandleSubscriber;
 import me.jessyan.rxerrorhandler.handler.ErrorHandleSubscriberOfFlowable;
@@ -33,7 +33,7 @@
  * <a href="https://github.com/JessYanCoding">Follow me</a>
  * ================================================
  */
-public class MainActivity extends AppCompatActivity {
+public class MainActivity extends Activity {
     private final String TAG = getClass().getSimpleName();
 
     @Override
diff --git a/build.gradle b/build.gradle
index dfc94cc..ae11cb1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.3'
+        classpath 'com.android.tools.build:gradle:3.2.1'
         classpath 'com.novoda:bintray-release:0.8.0'
 
     }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0119a97..aeced03 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ 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.8.1-all.zip
diff --git a/rxerrorhandler/build.gradle b/rxerrorhandler/build.gradle
index e3f2aff..97f364d 100644
--- a/rxerrorhandler/build.gradle
+++ b/rxerrorhandler/build.gradle
@@ -24,7 +24,7 @@ android {
 }
 
 dependencies {
-    compileOnly 'io.reactivex.rxjava2:rxjava:2.1.12'
+    compileOnly 'io.reactivex.rxjava3:rxjava:3.1.7'
 }
 
 apply from: 'bintray.gradle'
\ No newline at end of file
diff --git a/rxerrorhandler/src/main/java/me/jessyan/rxerrorhandler/handler/ErrorHandleSubscriber.java b/rxerrorhandler/src/main/java/me/jessyan/rxerrorhandler/handler/ErrorHandleSubscriber.java
index b96d114..e6c4933 100644
--- a/rxerrorhandler/src/main/java/me/jessyan/rxerrorhandler/handler/ErrorHandleSubscriber.java
+++ b/rxerrorhandler/src/main/java/me/jessyan/rxerrorhandler/handler/ErrorHandleSubscriber.java
@@ -15,9 +15,9 @@
  */
 package me.jessyan.rxerrorhandler.handler;
 
-import io.reactivex.Observer;
-import io.reactivex.annotations.NonNull;
-import io.reactivex.disposables.Disposable;
+import io.reactivex.rxjava3.annotations.NonNull;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.disposables.Disposable;
 import me.jessyan.rxerrorhandler.core.RxErrorHandler;
 
 /**
diff --git a/rxerrorhandler/src/main/java/me/jessyan/rxerrorhandler/handler/ErrorHandleSubscriberOfFlowable.java b/rxerrorhandler/src/main/java/me/jessyan/rxerrorhandler/handler/ErrorHandleSubscriberOfFlowable.java
index 1407f96..8dc0746 100644
--- a/rxerrorhandler/src/main/java/me/jessyan/rxerrorhandler/handler/ErrorHandleSubscriberOfFlowable.java
+++ b/rxerrorhandler/src/main/java/me/jessyan/rxerrorhandler/handler/ErrorHandleSubscriberOfFlowable.java
@@ -18,7 +18,7 @@
 import org.reactivestreams.Subscriber;
 import org.reactivestreams.Subscription;
 
-import io.reactivex.annotations.NonNull;
+import io.reactivex.rxjava3.annotations.NonNull;
 import me.jessyan.rxerrorhandler.core.RxErrorHandler;
 
 /**
diff --git a/rxerrorhandler/src/main/java/me/jessyan/rxerrorhandler/handler/RetryWithDelay.java b/rxerrorhandler/src/main/java/me/jessyan/rxerrorhandler/handler/RetryWithDelay.java
index f16826e..e49fe61 100644
--- a/rxerrorhandler/src/main/java/me/jessyan/rxerrorhandler/handler/RetryWithDelay.java
+++ b/rxerrorhandler/src/main/java/me/jessyan/rxerrorhandler/handler/RetryWithDelay.java
@@ -19,10 +19,10 @@
 
 import java.util.concurrent.TimeUnit;
 
-import io.reactivex.Observable;
-import io.reactivex.ObservableSource;
-import io.reactivex.annotations.NonNull;
-import io.reactivex.functions.Function;
+import io.reactivex.rxjava3.annotations.NonNull;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.ObservableSource;
+import io.reactivex.rxjava3.functions.Function;
 
 /**
  * ================================================
diff --git a/rxerrorhandler/src/main/java/me/jessyan/rxerrorhandler/handler/RetryWithDelayOfFlowable.java b/rxerrorhandler/src/main/java/me/jessyan/rxerrorhandler/handler/RetryWithDelayOfFlowable.java
index 1e89f0b..eff539c 100644
--- a/rxerrorhandler/src/main/java/me/jessyan/rxerrorhandler/handler/RetryWithDelayOfFlowable.java
+++ b/rxerrorhandler/src/main/java/me/jessyan/rxerrorhandler/handler/RetryWithDelayOfFlowable.java
@@ -21,9 +21,9 @@
 
 import java.util.concurrent.TimeUnit;
 
-import io.reactivex.Flowable;
-import io.reactivex.annotations.NonNull;
-import io.reactivex.functions.Function;
+import io.reactivex.rxjava3.annotations.NonNull;
+import io.reactivex.rxjava3.core.Flowable;
+import io.reactivex.rxjava3.functions.Function;
 
 /**
  * ================================================