diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
new file mode 100644
index 0000000..517cd3f
--- /dev/null
+++ b/.github/FUNDING.yml
@@ -0,0 +1 @@
+custom: https://paypal.me/janrabe/5
diff --git a/.travis.yml b/.travis.yml
index 12d2c57..6a37afa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,27 +1,53 @@
 language: android
-jdk: oraclejdk8
-- yes | sdkmanager "platforms;android-27"
+dist: trusty
+jdk: openjdk8
 
 env:
   global:
-    - ANDROID_API_LEVEL=27
-    - ANDROID_BUILD_TOOLS_VERSION=27.0.3
-    - TRAVIS_SECURE_ENV_VARS=true
+
+    - SLAVE_AAPT_TIMEOUT=31
+    - TERM=dumb
+    - GRADLE_OPTS="-XX:MaxPermSize=1024m -XX:+CMSClassUnloadingEnabled -XX:+HeapDumpOnOutOfMemoryError -Xmx2048m  -Dfile.encoding=UTF-8"
+
+matrix:
+  fast_finish: true
 
 android:
   components:
-    # The BuildTools version used by your project
-    - tools
+
     - platform-tools
-    - build-tools-$ANDROID_BUILD_TOOLS_VERSION
+    - tools
+    - build-tools-31.0.0
+    - android-31
+    - extra-google-m2repository
     - extra-android-m2repository
-    - extra-google-android-support
 
-    # The SDK version used to compile your project
-    - android-$ANDROID_API_LEVEL
+  # https://docs.travis-ci.com/user/languages/android/
   licenses:
-    - '.+'
+    - 'android-sdk-preview-license-.+'
+    - 'android-sdk-license-.+'
+    - 'google-gdk-license-.+'
+
+before_install:
+  - git submodule update --init --recursive
+  - chmod u+x gradlew
+  - android list sdk --no-ui --all --extended
+  - android list targets
+  - yes | sdkmanager "platforms;android-31"
+
+
+
+install: true
 
 script:
-    - ./gradlew clean
-    - ./gradlew assembleDebug
+  - wget https://github.com/sormuras/bach/raw/master/install-jdk.sh
+  - chmod +x $TRAVIS_BUILD_DIR/install-jdk.sh
+  - export JAVA_HOME=$HOME/openjdk11
+  - $TRAVIS_BUILD_DIR/install-jdk.sh -F 11 --target $JAVA_HOME
+  - ./gradlew -v
+  - ./gradlew clean build --stacktrace
+
+after_failure: true
+
+notifications:
+  email: false
diff --git a/README.md b/README.md
index 93f1099..bae7bf4 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,11 @@
 # ProgressManager
-[ ![Jcenter](https://img.shields.io/badge/Jcenter-v1.5.0-brightgreen.svg?style=flat-square) ](https://bintray.com/jessyancoding/maven/progressmanager/1.5.0/link)
-[ ![Build Status](https://travis-ci.org/JessYanCoding/ProgressManager.svg?branch=master) ](https://travis-ci.org/JessYanCoding/ProgressManager)
+[![](https://jitpack.io/v/kibotu/ProgressManager.svg)](https://jitpack.io/#kibotu/ProgressManager)
+[![Build Status](https://app.travis-ci.com/kibotu/ProgressManager.svg?branch=master)](https://app.travis-ci.com/kibotu/ProgressManager)
 [ ![Android Arsenal](https://img.shields.io/badge/Android%20Arsenal-ProgressManager-brightgreen.svg?style=flat-square)](https://android-arsenal.com/details/1/5865)
 [ ![API](https://img.shields.io/badge/API-14%2B-blue.svg?style=flat-square) ](https://developer.android.com/about/versions/android-4.0.html)
 [ ![License](http://img.shields.io/badge/License-Apache%202.0-blue.svg?style=flat-square) ](http://www.apache.org/licenses/LICENSE-2.0)
 [ ![Author](https://img.shields.io/badge/Author-JessYan-orange.svg?style=flat-square) ](https://www.jianshu.com/u/1d0c0bc634db)
-[ ![QQ-Group](https://img.shields.io/badge/QQ%E7%BE%A4-455850365%20%7C%20301733278-orange.svg?style=flat-square) ](https://shang.qq.com/wpa/qunwpa?idkey=7e59e59145e6c7c68932ace10f52790636451f01d1ecadb6a652b1df234df753)
+[ ![Author](https://img.shields.io/badge/Author-Jan%20Rabe-orange.svg?style=flat-square) ](https://kibotu.net)
 
 
 ## Listen the progress of  downloading and uploading in Okhttp (compatible Retrofit and Glide).
@@ -33,7 +33,15 @@
 
 ## Download
 ``` gradle
- implementation 'me.jessyan:progressmanager:1.5.0'
+allprojects {
+    repositories {
+        ...
+        maven { url 'https://jitpack.io' }
+    }
+}
+dependencies {
+    implementation 'com.github.kibotu:ProgressManager:Tag'
+}
 ```
 
 ## Usage
@@ -58,22 +66,16 @@
  ProgressManager.getInstance().addRequestListener(UPLOAD_URL, getUploadListener());
 ```
 
+## About Me
 
-## ProGuard
-```
- -keep class me.jessyan.progressmanager.** { *; }
- -keep interface me.jessyan.progressmanager.** { *; }
-```
+Follow me on Twitter: [@wolkenschauer](https://twitter.com/wolkenschauer)
+Let me know what you think: [jan.rabe@kibotu.net](mailto:jan.rabe@kibotu.net)
 
-## About Me
-* **Email**: <jess.yan.effort@gmail.com>
-* **Home**: <http://jessyan.me>
-* **掘金**: <https://juejin.im/user/57a9dbd9165abd0061714613>
-* **简书**: <https://www.jianshu.com/u/1d0c0bc634db>
+Contributions welcome!
 
 ## License
 ```
- Copyright 2017, jessyan
+ Copyright 2021, Jan Rabe
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/app/build.gradle b/app/build.gradle
index ccab3fd..d9d8465 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,4 +1,5 @@
 apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
 
 android {
     compileSdkVersion rootProject.compileSdkVersion
@@ -25,12 +26,19 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    testImplementation 'junit:junit:4.12'
-    implementation 'com.android.support:appcompat-v7:27.1.1'
-    implementation 'com.squareup.okhttp3:okhttp:3.10.0'
-    implementation 'com.github.bumptech.glide:glide:4.6.1'
-    annotationProcessor 'com.github.bumptech.glide:compiler:4.6.1'
-    implementation 'com.github.bumptech.glide:okhttp3-integration:4.6.1'
+    testImplementation 'junit:junit:4.13.2'
+
+    implementation 'androidx.appcompat:appcompat:1.3.1'
+    implementation 'androidx.appcompat:appcompat-resources:1.3.1'
+    implementation "androidx.annotation:annotation:1.2.0"
+    implementation 'androidx.core:core-ktx:1.7.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
+    implementation 'com.google.android.material:material:1.4.0'
+
+    implementation 'com.squareup.okhttp3:okhttp:4.9.2'
+    implementation 'com.github.bumptech.glide:glide:4.12.0'
+    annotationProcessor 'com.github.bumptech.glide:compiler:4.12.0'
+    implementation 'com.github.bumptech.glide:okhttp3-integration:4.12.0'
     implementation project(':progress')
 //    implementation 'me.jessyan:progressmanager:1.5.0'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index fbb8a74..25c4160 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="me.jessyan.progressmanager.demo">
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    package="me.jessyan.progressmanager.demo">
 
-    <uses-permission android:name="android.permission.INTERNET"/>
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 
     <application
         android:name=".BaseApplication"
-        android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
@@ -16,18 +16,18 @@
         android:theme="@style/AppTheme">
         <activity
             android:name=".MainActivity"
-            android:label="ProgressManager Base"
-            >
+            android:exported="true"
+            android:label="ProgressManager Base">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
+                <action android:name="android.intent.action.MAIN" />
 
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
         <activity
             android:name=".AdvanceActivity"
-            android:label="ProgressManager Advance"
-            />
+            android:exported="false"
+            android:label="ProgressManager Advance" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/me/jessyan/progressmanager/demo/AdvanceActivity.java b/app/src/main/java/me/jessyan/progressmanager/demo/AdvanceActivity.java
index dfe0791..ab2455c 100644
--- a/app/src/main/java/me/jessyan/progressmanager/demo/AdvanceActivity.java
+++ b/app/src/main/java/me/jessyan/progressmanager/demo/AdvanceActivity.java
@@ -17,14 +17,15 @@
 
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
 
 import java.io.BufferedInputStream;
@@ -79,8 +80,8 @@ protected void onCreate(Bundle savedInstanceState) {
         initView();
         initListener();
         //在 Activity 中显示进度条的同时,也在 Fragment 中显示对应 url 的进度条,为了展示此框架的多端同步更新某一个进度信息
-        getSupportFragmentManager().beginTransaction().add(R.id.fragment_container,
-                AdvanceFragment.newInstance(mNewImageUrl, mNewDownloadUrl, mNewUploadUrl)).commit();
+//        getSupportFragmentManager().beginTransaction().add(R.id.fragment_container,
+//                AdvanceFragment.newInstance(mNewImageUrl, mNewDownloadUrl, mNewUploadUrl)).commit();
     }
 
 
diff --git a/app/src/main/java/me/jessyan/progressmanager/demo/AdvanceFragment.java b/app/src/main/java/me/jessyan/progressmanager/demo/AdvanceFragment.java
index b87f5f5..bf85091 100644
--- a/app/src/main/java/me/jessyan/progressmanager/demo/AdvanceFragment.java
+++ b/app/src/main/java/me/jessyan/progressmanager/demo/AdvanceFragment.java
@@ -17,9 +17,6 @@
 
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -27,6 +24,10 @@
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 
diff --git a/app/src/main/java/me/jessyan/progressmanager/demo/MainActivity.java b/app/src/main/java/me/jessyan/progressmanager/demo/MainActivity.java
index e001091..2d929c9 100644
--- a/app/src/main/java/me/jessyan/progressmanager/demo/MainActivity.java
+++ b/app/src/main/java/me/jessyan/progressmanager/demo/MainActivity.java
@@ -18,16 +18,18 @@
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
 
+import org.jetbrains.annotations.NotNull;
+
 import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.FileOutputStream;
@@ -101,8 +103,8 @@ protected void onCreate(Bundle savedInstanceState) {
         initView();
         initListener();
         //在 Activity 中显示进度条的同时,也在 Fragment 中显示对应 url 的进度条,为了展示此框架的多端同步更新某一个进度信息
-        getSupportFragmentManager().beginTransaction().add(R.id.fragment_container,
-                MainFragment.newInstance(mImageUrl, mDownloadUrl, mUploadUrl)).commit();
+//        getSupportFragmentManager().beginTransaction().add(R.id.fragment_container,
+//                MainFragment.newInstance(mImageUrl, mDownloadUrl, mUploadUrl)).commit();
     }
 
 
@@ -135,7 +137,7 @@ private void initListener() {
     }
 
 
-    @NonNull
+    @NotNull
     private ProgressListener getGlideListener() {
         return new ProgressListener() {
             @Override
@@ -163,7 +165,7 @@ public void run() {
         };
     }
 
-    @NonNull
+    @NotNull
     private ProgressListener getUploadListener() {
         return new ProgressListener() {
             @Override
@@ -206,7 +208,7 @@ public void run() {
         };
     }
 
-    @NonNull
+    @NotNull
     private ProgressListener getDownloadListener() {
         return new ProgressListener() {
             @Override
diff --git a/app/src/main/java/me/jessyan/progressmanager/demo/MainFragment.java b/app/src/main/java/me/jessyan/progressmanager/demo/MainFragment.java
index ac35b3f..419f65f 100644
--- a/app/src/main/java/me/jessyan/progressmanager/demo/MainFragment.java
+++ b/app/src/main/java/me/jessyan/progressmanager/demo/MainFragment.java
@@ -17,9 +17,6 @@
 
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -27,6 +24,10 @@
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index d296278..f2b3445 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
     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"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -13,62 +12,55 @@
         android:id="@+id/imageView"
         android:layout_width="match_parent"
         android:layout_height="100dp"
-        android:scaleType="centerCrop"
-        />
+        android:scaleType="centerCrop" />
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="55dp"
         android:gravity="center"
-        android:orientation="horizontal"
-        >
+        android:orientation="horizontal">
 
         <Button
             android:id="@+id/glide_start"
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="1"
-            android:text="Glide start"
-            />
+            android:text="Glide start" />
 
         <Button
             android:id="@+id/download_start"
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="1"
-            android:text="download start"
-            />
+            android:text="download start" />
 
         <Button
             android:id="@+id/upload_start"
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="1"
-            android:text="upload start"
-            />
+            android:text="upload start" />
+
         <Button
             android:id="@+id/advance"
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="1"
-            android:text="advance"
-            />
+            android:text="advance" />
 
     </LinearLayout>
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:orientation="vertical"
-        >
+        android:orientation="vertical">
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_weight="1"
             android:background="#3ff"
-            android:orientation="vertical"
-            >
+            android:orientation="vertical">
 
             <TextView
                 android:layout_width="wrap_content"
@@ -77,16 +69,14 @@
                 android:text="In Activity"
                 android:textColor="#fff"
                 android:textSize="20dp"
-                android:textStyle="bold"
-                />
+                android:textStyle="bold" />
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
                 android:layout_weight="1"
                 android:gravity="center_vertical"
-                android:orientation="horizontal"
-                >
+                android:orientation="horizontal">
 
                 <TextView
                     android:layout_width="wrap_content"
@@ -95,8 +85,7 @@
                     android:text="Glide          "
                     android:textColor="#fff"
                     android:textSize="17dp"
-                    android:textStyle="bold"
-                    />
+                    android:textStyle="bold" />
 
                 <ProgressBar
                     android:id="@+id/glide_progress"
@@ -105,15 +94,14 @@
                     android:layout_height="match_parent"
                     android:layout_marginRight="10dp"
                     android:max="100"
-                    android:progress="0"/>
+                    android:progress="0" />
 
                 <TextView
                     android:id="@+id/glide_progress_text"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    tools:text="100%"
                     android:textColor="#fff"
-                    />
+                    tools:text="100%" />
 
             </LinearLayout>
 
@@ -122,8 +110,7 @@
                 android:layout_height="0dp"
                 android:layout_weight="1"
                 android:gravity="center_vertical"
-                android:orientation="horizontal"
-                >
+                android:orientation="horizontal">
 
                 <TextView
                     android:layout_width="wrap_content"
@@ -132,8 +119,7 @@
                     android:text="Download  "
                     android:textColor="#fff"
                     android:textSize="17dp"
-                    android:textStyle="bold"
-                    />
+                    android:textStyle="bold" />
 
                 <ProgressBar
                     android:id="@+id/download_progress"
@@ -142,15 +128,14 @@
                     android:layout_height="wrap_content"
                     android:layout_marginRight="10dp"
                     android:max="100"
-                    android:progress="0"/>
+                    android:progress="0" />
 
                 <TextView
                     android:id="@+id/download_progress_text"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    tools:text="100%"
                     android:textColor="#fff"
-                    />
+                    tools:text="100%" />
 
             </LinearLayout>
 
@@ -159,8 +144,7 @@
                 android:layout_height="0dp"
                 android:layout_weight="1"
                 android:gravity="center_vertical"
-                android:orientation="horizontal"
-                >
+                android:orientation="horizontal">
 
                 <TextView
                     android:layout_width="wrap_content"
@@ -169,8 +153,7 @@
                     android:text="Upload       "
                     android:textColor="#fff"
                     android:textSize="17dp"
-                    android:textStyle="bold"
-                    />
+                    android:textStyle="bold" />
 
                 <ProgressBar
                     android:id="@+id/upload_progress"
@@ -179,15 +162,14 @@
                     android:layout_height="wrap_content"
                     android:layout_marginRight="10dp"
                     android:max="100"
-                    android:progress="0"/>
+                    android:progress="0" />
 
                 <TextView
                     android:id="@+id/upload_progress_text"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    tools:text="100%"
                     android:textColor="#fff"
-                    />
+                    tools:text="100%" />
 
             </LinearLayout>
 
@@ -198,10 +180,7 @@
             android:id="@+id/fragment_container"
             android:layout_width="match_parent"
             android:layout_height="0dp"
-            android:layout_weight="1"
-            />
-
-
+            android:layout_weight="1" />
 
 
     </LinearLayout>
diff --git a/build.gradle b/build.gradle
index 929206e..e4fb009 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,20 +1,28 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
+apply plugin: 'jacoco'
 
 buildscript {
+
+    ext.kotlin_version = '1.5.31'
+    ext.libraryVersion = '2.0.0'
+
     repositories {
         google()
-        jcenter()
+        mavenCentral()
+        maven { url 'https://jitpack.io' }
+
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.3'
-        classpath 'com.novoda:bintray-release:0.8.0'
+        classpath 'com.android.tools.build:gradle:7.0.3'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
 
 allprojects {
+
     repositories {
         google()
-        jcenter()
+        mavenCentral()
+        maven { url 'https://jitpack.io' }
     }
 }
 
@@ -24,9 +32,9 @@ task clean(type: Delete) {
 
 ext {
     minSdkVersion = 14
-    targetSdkVersion = 27
-    compileSdkVersion = 27
-    buildToolsVersion = "27.0.3"
-    versionCode = 20
-    versionName = "1.5.0"
+    targetSdkVersion = 31
+    compileSdkVersion = 31
+    buildToolsVersion = "31.0.0"
+    versionCode = 21
+    versionName = "2.0.0"
 }
diff --git a/gradle.properties b/gradle.properties
index f1c49f3..d9b937c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,17 +1,57 @@
-# Project-wide Gradle settings.
-
-# IDE (e.g. Android Studio) users:
-# Gradle settings configured through the IDE *will override*
-# any settings specified in this file.
-
-# For more details on how to configure your build environment visit
-# 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.
-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
-# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
\ No newline at end of file
+## =================================================================================================
+## gradle
+## =================================================================================================
+org.gradle.jvmargs=-Xmx8g -Xms1g -XX:MaxPermSize=1g -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseCompressedOops -XX:+CMSClassUnloadingEnabled -XX:+UseParallelGC
+org.gradle.caching=true
+org.gradle.configureondemand=true
+org.gradle.daemon=true
+org.gradle.info=true
+org.gradle.offline=true
+org.gradle.profile=true
+org.gradle.parallel=true
+org.gradle.parallel.threads=8
+org.gradle.workers.max=32
+# https://blog.gradle.org/introducing-file-system-watching
+org.gradle.unsafe.watch-fs=true
+## =================================================================================================
+## java
+## =================================================================================================
+compileJava.options.incremental=true
+compileJava.options.fork=true
+## =================================================================================================
+## android
+## =================================================================================================
+# https://developer.android.com/topic/libraries/support-library/androidx-overview
+android.useAndroidX=true
+# Automatically convert third-party libraries to use AndroidX
+android.enableJetifier=true
+android.enableDexingArtifactTransform=false
+## Determines whether to generate a BuildConfig class.
+android.defaults.buildfeatures.buildconfig=true
+## Determines whether to support Data Binding.
+android.defaults.buildFeatures.dataBinding=false
+## Determines whether to support View Binding.
+android.defaults.buildFeatures.viewBinding=true
+## Determines whether to generate binder classes for your AIDL files.
+android.defaults.buildfeatures.aidl=false
+## Determines whether to support RenderScript.
+android.defaults.buildfeatures.renderscript=false
+## Determines whether to support injecting custom variables into the module’s R class.
+android.defaults.buildfeatures.resvalues=true
+## Determines whether to support shader AOT compilation.
+android.defaults.buildfeatures.shaders=false
+## =================================================================================================
+## kotlin
+## =================================================================================================
+# Kotlin code style for this project: "official" or "obsolete":
+kotlin.code.style=official
+kotlin.incremental=true
+kotlin.caching.enabled=true
+kotlin.incremental.js=true
+## =================================================================================================
+## kapt
+## =================================================================================================
+kapt.incremental.apt=true
+kapt.use.worker.api=true
+# https://blog.jetbrains.com/kotlin/2019/04/kotlin-1-3-30-released/
+kapt.include.compile.classpath=false
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 13372ae..7454180 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 3d2172b..ffed3a2 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Fri Jun 15 10:29:02 CST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
diff --git a/gradlew b/gradlew
index 9d82f78..1b6c787 100755
--- a/gradlew
+++ b/gradlew
@@ -1,74 +1,129 @@
-#!/usr/bin/env bash
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+APP_BASE_NAME=${0##*/}
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
-warn ( ) {
+warn () {
     echo "$*"
-}
+} >&2
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
+nonstop=false
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -77,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
+    JAVACMD=java
     which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
@@ -85,76 +140,95 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
 fi
 
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
     # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
         fi
-        i=$((i+1))
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
     done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
-}
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
-
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
+exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
index aec9973..ac1b06f 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -8,20 +24,23 @@
 @rem Set local scope for the variables with windows NT shell
 if "%OS%"=="Windows_NT" setlocal
 
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
 set DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -35,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -45,34 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windowz variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell
diff --git a/jitpack.yml b/jitpack.yml
new file mode 100644
index 0000000..46c8529
--- /dev/null
+++ b/jitpack.yml
@@ -0,0 +1,2 @@
+jdk:
+  - openjdk11
\ No newline at end of file
diff --git a/progress/bintray.gradle b/progress/bintray.gradle
deleted file mode 100644
index c32fc80..0000000
--- a/progress/bintray.gradle
+++ /dev/null
@@ -1,25 +0,0 @@
-apply plugin: 'com.novoda.bintray-release'
-
-allprojects {
-    repositories {
-        jcenter()
-    }
-    tasks.withType(Javadoc) {
-        options{ encoding "UTF-8"
-            charSet 'UTF-8'
-            links "http://docs.oracle.com/javase/7/docs/api"
-        }
-    }
-}
-
-
-def siteUrl = 'https://github.com/JessYanCoding/ProgressManager'   // 项目的主页
-
-publish {
-    userOrg = 'jessyancoding'      //bintray注册的用户名
-    groupId = 'me.jessyan'         //compile引用时的第1部分groupId
-    artifactId = 'progressmanager'     //compile引用时的第2部分项目名
-    publishVersion = rootProject.versionName    //compile引用时的第3部分版本号
-    desc = 'Listen the progress of downloading and uploading in Okhttp (compatible Retrofit and Glide).'
-    website = siteUrl
-}
diff --git a/progress/build.gradle b/progress/build.gradle
index 2ce9e71..038e9b8 100644
--- a/progress/build.gradle
+++ b/progress/build.gradle
@@ -1,4 +1,6 @@
 apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+apply plugin: 'maven-publish'
 
 android {
     compileSdkVersion rootProject.compileSdkVersion
@@ -11,14 +13,43 @@ android {
         versionName rootProject.versionName
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-
+        consumerProguardFiles "consumer-rules.pro"
     }
+
     buildTypes {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+
+    // region java compile options
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
+    }
+
+    java {
+        toolchain {
+            languageVersion.set(JavaLanguageVersion.of(11))
+        }
+    }
+
+    // endregion
+
+    // region kotlin compile options
+
+    kotlinOptions {
+        jvmTarget = "11"
+        freeCompilerArgs += [
+                // disable linting for opt-in annotations
+                "-Xopt-in=kotlin.RequiresOptIn",
+        ]
+    }
+
+    // endregion
+
     lintOptions {
         abortOnError false
         warning 'InvalidPackage'
@@ -26,7 +57,18 @@ android {
 }
 
 dependencies {
-    compileOnly 'com.squareup.okhttp3:okhttp:3.10.0'
+    compileOnly 'com.squareup.okhttp3:okhttp:4.9.2'
 }
 
-apply from: 'bintray.gradle'
\ No newline at end of file
+afterEvaluate {
+    publishing {
+        publications {
+            release(MavenPublication) {
+                from components.release
+                groupId = "me.jessyan"
+                artifactId = 'progressmanager'
+                version = libraryVersion
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/progress/consumer-rules.pro b/progress/consumer-rules.pro
new file mode 100644
index 0000000..6aaae8c
--- /dev/null
+++ b/progress/consumer-rules.pro
@@ -0,0 +1,3 @@
+
+ -keep class me.jessyan.progressmanager.** { *; }
+ -keep interface me.jessyan.progressmanager.** { *; }
diff --git a/progress/src/main/java/me/jessyan/progressmanager/ProgressManager.java b/progress/src/main/java/me/jessyan/progressmanager/ProgressManager.java
index 7e8421e..90d3c3b 100644
--- a/progress/src/main/java/me/jessyan/progressmanager/ProgressManager.java
+++ b/progress/src/main/java/me/jessyan/progressmanager/ProgressManager.java
@@ -24,6 +24,7 @@
 
 import java.io.IOException;
 import java.lang.ref.ReferenceQueue;
+import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
@@ -145,6 +146,30 @@ public void addRequestListener(String url, ProgressListener listener) {
         progressListeners.add(listener);
     }
 
+    public void removeRequestListener(String url) {
+        checkNotNull(url, "url cannot be null");
+        synchronized (ProgressManager.class) {
+            mRequestListeners.remove(url);
+        }
+    }
+
+    public void removeRequestListener(ProgressListener listener) {
+        checkNotNull(listener, "listener cannot be null");
+        synchronized (ProgressManager.class) {
+
+            Iterator<Map.Entry<String, List<ProgressListener>>> it = mRequestListeners.entrySet().iterator();
+            while (it.hasNext()) {
+                Map.Entry<String, List<ProgressListener>> pair = it.next();
+                List progressListeners = pair.getValue();
+
+                progressListeners.remove(listener);
+
+                if (progressListeners.isEmpty())
+                    it.remove(); // avoids a ConcurrentModificationException
+            }
+        }
+    }
+
     /**
      * 将需要被监听下载进度的 {@code url} 注册到管理器,此操作请在页面初始化时进行,切勿多次注册同一个(内容相同)监听器
      *
@@ -166,6 +191,24 @@ public void addResponseListener(String url, ProgressListener listener) {
     }
 
 
+    public void removeResponseListener(ProgressListener listener) {
+        checkNotNull(listener, "listener cannot be null");
+        synchronized (ProgressManager.class) {
+
+            Iterator<Map.Entry<String, List<ProgressListener>>> it = mResponseListeners.entrySet().iterator();
+            while (it.hasNext()) {
+                Map.Entry<String, List<ProgressListener>> pair = it.next();
+                List progressListeners = pair.getValue();
+
+                progressListeners.remove(listener);
+
+                if (progressListeners.isEmpty())
+                    it.remove(); // avoids a ConcurrentModificationException
+            }
+        }
+    }
+
+
     /**
      * 当在 {@link ProgressRequestBody} 和 {@link ProgressResponseBody} 内部处理二进制流时发生错误
      * 会主动调用 {@link ProgressListener#onError(long, Exception)},但是有些错误并不是在它们内部发生的