diff --git a/app/build.gradle b/app/build.gradle
index 95d67bd..2949a78 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,12 +8,12 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
 
     defaultConfig {
         applicationId "com.keenfin.audioviewdemo"
         minSdkVersion 14
-        targetSdkVersion 28
+        targetSdkVersion 29
         versionCode 1
         versionName "1.0"
     }
@@ -29,7 +29,7 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation 'com.4ert:sfcdialog:0.2'
     implementation project(':audioview')
-    implementation 'com.android.support:design:28.0.0'
-    implementation 'com.android.support:appcompat-v7:28.0.0'
-    implementation 'com.android.support:support-compat:28.0.0'
+    implementation 'com.google.android.material:material:1.0.0'
+    implementation 'androidx.appcompat:appcompat:1.0.2'
+    implementation 'androidx.core:core:1.0.2'
 }
diff --git a/app/src/main/java/com/keenfin/audioviewdemo/AudioAdapter.java b/app/src/main/java/com/keenfin/audioviewdemo/AudioAdapter.java
index abe0f94..3d0e0cb 100644
--- a/app/src/main/java/com/keenfin/audioviewdemo/AudioAdapter.java
+++ b/app/src/main/java/com/keenfin/audioviewdemo/AudioAdapter.java
@@ -7,8 +7,8 @@
 
 package com.keenfin.audioviewdemo;
 
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/app/src/main/java/com/keenfin/audioviewdemo/ListActivity.java b/app/src/main/java/com/keenfin/audioviewdemo/ListActivity.java
index 587a8b9..60a4741 100644
--- a/app/src/main/java/com/keenfin/audioviewdemo/ListActivity.java
+++ b/app/src/main/java/com/keenfin/audioviewdemo/ListActivity.java
@@ -16,9 +16,9 @@
 import android.os.Bundle;
 import android.os.IBinder;
 import android.provider.MediaStore;
-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 com.keenfin.audioview.AudioService;
 
 import java.util.ArrayList;
diff --git a/app/src/main/java/com/keenfin/audioviewdemo/MainActivity.java b/app/src/main/java/com/keenfin/audioviewdemo/MainActivity.java
index 5b425ef..4b1bac6 100644
--- a/app/src/main/java/com/keenfin/audioviewdemo/MainActivity.java
+++ b/app/src/main/java/com/keenfin/audioviewdemo/MainActivity.java
@@ -13,9 +13,10 @@
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.ActivityCompat;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.app.ActivityCompat;
+
 import android.view.View;
 import com.keenfin.audioview.AudioService;
 import com.keenfin.audioview.AudioView;
diff --git a/app/src/main/res/layout/activity_list.xml b/app/src/main/res/layout/activity_list.xml
index 2218d39..adb36d9 100644
--- a/app/src/main/res/layout/activity_list.xml
+++ b/app/src/main/res/layout/activity_list.xml
@@ -12,7 +12,7 @@
     android:layout_height="match_parent"
     tools:context=".ListActivity">
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recycler"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/audioview/build.gradle b/audioview/build.gradle
index 2bdf96d..8e35a5f 100644
--- a/audioview/build.gradle
+++ b/audioview/build.gradle
@@ -39,7 +39,7 @@ android {
         targetSdkVersion 28
         versionCode 23
         versionName "1.4.9"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
         release {
@@ -54,10 +54,10 @@ apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/bintrayv1.
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.android.support:design:28.0.0'
-    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'com.google.android.material:material:1.0.0'
+    implementation 'androidx.appcompat:appcompat:1.0.2'
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support:support-annotations:28.0.0'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    androidTestImplementation 'androidx.test:runner:1.1.1'
+    androidTestImplementation 'androidx.annotation:annotation:1.0.2'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
 }
diff --git a/audioview/src/main/java/com/keenfin/audioview/AudioService.java b/audioview/src/main/java/com/keenfin/audioview/AudioService.java
index 2baec03..fb1062b 100644
--- a/audioview/src/main/java/com/keenfin/audioview/AudioService.java
+++ b/audioview/src/main/java/com/keenfin/audioview/AudioService.java
@@ -16,11 +16,12 @@
 import android.os.Binder;
 import android.os.Build;
 import android.os.IBinder;
-import android.support.annotation.Nullable;
-import android.support.v4.app.NotificationCompat;
 import android.view.View;
 import android.widget.RemoteViews;
 
+import androidx.annotation.Nullable;
+import androidx.core.app.NotificationCompat;
+
 import java.io.FileDescriptor;
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/audioview/src/main/java/com/keenfin/audioview/AudioView.java b/audioview/src/main/java/com/keenfin/audioview/AudioView.java
index e1d2830..956f272 100644
--- a/audioview/src/main/java/com/keenfin/audioview/AudioView.java
+++ b/audioview/src/main/java/com/keenfin/audioview/AudioView.java
@@ -12,7 +12,7 @@
 import android.net.Uri;
 import android.os.Handler;
 import android.os.Message;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.SeekBar;
diff --git a/audioview/src/main/java/com/keenfin/audioview/AudioView2.java b/audioview/src/main/java/com/keenfin/audioview/AudioView2.java
index 42fbc64..a58046f 100644
--- a/audioview/src/main/java/com/keenfin/audioview/AudioView2.java
+++ b/audioview/src/main/java/com/keenfin/audioview/AudioView2.java
@@ -11,7 +11,7 @@
 import android.content.*;
 import android.net.Uri;
 import android.os.IBinder;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.View;
diff --git a/audioview/src/main/java/com/keenfin/audioview/BaseAudioView.java b/audioview/src/main/java/com/keenfin/audioview/BaseAudioView.java
index 077a121..eadd94b 100644
--- a/audioview/src/main/java/com/keenfin/audioview/BaseAudioView.java
+++ b/audioview/src/main/java/com/keenfin/audioview/BaseAudioView.java
@@ -15,11 +15,11 @@
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Build;
-import android.support.annotation.ColorInt;
-import android.support.annotation.FloatRange;
-import android.support.annotation.Nullable;
-import android.support.design.widget.FloatingActionButton;
-import android.support.v4.content.ContextCompat;
+import androidx.annotation.ColorInt;
+import androidx.annotation.FloatRange;
+import androidx.annotation.Nullable;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import androidx.core.content.ContextCompat;
 import android.text.method.ScrollingMovementMethod;
 import android.util.AttributeSet;
 import android.view.View;
diff --git a/audioview/src/main/res/layout/audioview.xml b/audioview/src/main/res/layout/audioview.xml
index b9e254d..aac212e 100644
--- a/audioview/src/main/res/layout/audioview.xml
+++ b/audioview/src/main/res/layout/audioview.xml
@@ -68,7 +68,7 @@
                 android:src="@drawable/ic_fast_rewind_black_24dp"
                 tools:ignore="ContentDescription" />
 
-            <android.support.design.widget.FloatingActionButton
+            <com.google.android.material.floatingactionbutton.FloatingActionButton
                 android:id="@+id/play"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
diff --git a/audioview/src/main/res/layout/audioview_min.xml b/audioview/src/main/res/layout/audioview_min.xml
index 57bbba6..50ff277 100644
--- a/audioview/src/main/res/layout/audioview_min.xml
+++ b/audioview/src/main/res/layout/audioview_min.xml
@@ -14,7 +14,7 @@
     android:gravity="center_vertical"
     android:orientation="horizontal">
 
-    <android.support.design.widget.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/play"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/build.gradle b/build.gradle
index 037b5a4..2b032a3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,7 +10,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.2'
+        classpath 'com.android.tools.build:gradle:3.5.0'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
 
diff --git a/gradle.properties b/gradle.properties
index 1d3591c..915f0e6 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -15,4 +15,6 @@
 # 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
+# org.gradle.parallel=true
+android.enableJetifier=true
+android.useAndroidX=true
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 596c019..2db5f21 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed May 22 18:21:14 MSK 2019
+#Mon Aug 26 20:31:10 MSK 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip