diff --git a/build.gradle b/build.gradle
index 4b93e89..83f3353 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,9 +6,10 @@ buildscript {
         maven {
             url "https://plugins.gradle.org/m2/"
         }
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.0-beta1'
+        classpath 'com.android.tools.build:gradle:3.4.1'
         classpath "com.github.dcendents:android-maven-gradle-plugin:1.4.1"
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.2'
     }
@@ -17,6 +18,7 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
+        google()
     }
 }
 
diff --git a/example/build.gradle b/example/build.gradle
index ac469d5..67bfd71 100644
--- a/example/build.gradle
+++ b/example/build.gradle
@@ -1,26 +1,25 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion rootProject.compileSdkVersion
-    buildToolsVersion rootProject.buildToolsVersion
+    compileSdkVersion 29
 
-    signingConfigs {
-
-        def pathToProperties = "keyz/signing.properties"
-        if (!(file(pathToProperties)).exists()) {
-            throw new GradleException("You have to specify a valid signing properties file.")
-        }
-        Properties props = new Properties()
-        props.load(new FileInputStream(file(pathToProperties)))
-
-        release {
-            keyAlias props['keyAlias']
-            keyPassword props['keyPassword']
-            storePassword props['storePassword']
-            storeFile file('keyz/keystore.jks')
-        }
-
-    }
+//    signingConfigs {
+//
+//        def pathToProperties = "keyz/signing.properties"
+//        if (!(file(pathToProperties)).exists()) {
+//            throw new GradleException("You have to specify a valid signing properties file.")
+//        }
+//        Properties props = new Properties()
+//        props.load(new FileInputStream(file(pathToProperties)))
+//
+//        release {
+//            keyAlias props['keyAlias']
+//            keyPassword props['keyPassword']
+//            storePassword props['storePassword']
+//            storeFile file('keyz/keystore.jks')
+//        }
+//
+//    }
 
     defaultConfig {
         applicationId "com.futuremind.recyclerviewfastscroll.example"
@@ -32,17 +31,17 @@ android {
     buildTypes {
         release {
             minifyEnabled false
-            signingConfig signingConfigs.release
+//            signingConfig signingConfigs.release
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile project(':fastscroll')
-    compile 'com.android.support:appcompat-v7:23.4.0'
-    compile 'com.android.support:recyclerview-v7:23.4.0'
-    compile 'com.android.support:design:23.4.0'
-    compile 'com.android.support:support-v4:23.4.0'
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation project(':fastscroll')
+    implementation 'androidx.appcompat:appcompat:1.0.2'
+    implementation 'androidx.recyclerview:recyclerview:1.0.0'
+    implementation 'com.google.android.material:material:1.0.0'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
 }
diff --git a/example/src/main/java/com/futuremind/recyclerviewfastscroll/example/MainActivity.java b/example/src/main/java/com/futuremind/recyclerviewfastscroll/example/MainActivity.java
index ad50182..2b14e07 100644
--- a/example/src/main/java/com/futuremind/recyclerviewfastscroll/example/MainActivity.java
+++ b/example/src/main/java/com/futuremind/recyclerviewfastscroll/example/MainActivity.java
@@ -1,9 +1,9 @@
 package com.futuremind.recyclerviewfastscroll.example;
 
 import android.os.Bundle;
-import android.support.design.widget.TabLayout;
-import android.support.v4.view.ViewPager;
-import android.support.v7.app.AppCompatActivity;
+import com.google.android.material.tabs.TabLayout;
+import androidx.viewpager.widget.ViewPager;
+import androidx.appcompat.app.AppCompatActivity;
 
 import com.futuremind.recyclerviewfastscroll.example.adapters.ExampleFragmentsAdapter;
 
@@ -14,8 +14,8 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 
-        ViewPager pager = (ViewPager) findViewById(R.id.pager);
-        TabLayout tabs = (TabLayout) findViewById(R.id.tab_layout);
+        ViewPager pager = findViewById(R.id.pager);
+        TabLayout tabs = findViewById(R.id.tab_layout);
 
         pager.setAdapter(new ExampleFragmentsAdapter(this, getSupportFragmentManager()));
         tabs.setupWithViewPager(pager);
diff --git a/example/src/main/java/com/futuremind/recyclerviewfastscroll/example/adapters/CountriesAdapter.java b/example/src/main/java/com/futuremind/recyclerviewfastscroll/example/adapters/CountriesAdapter.java
index d7317d3..8ef7f8c 100644
--- a/example/src/main/java/com/futuremind/recyclerviewfastscroll/example/adapters/CountriesAdapter.java
+++ b/example/src/main/java/com/futuremind/recyclerviewfastscroll/example/adapters/CountriesAdapter.java
@@ -1,7 +1,7 @@
 package com.futuremind.recyclerviewfastscroll.example.adapters;
 
 import android.content.Context;
-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/example/src/main/java/com/futuremind/recyclerviewfastscroll/example/adapters/ExampleFragmentsAdapter.java b/example/src/main/java/com/futuremind/recyclerviewfastscroll/example/adapters/ExampleFragmentsAdapter.java
index b98a079..a91de85 100644
--- a/example/src/main/java/com/futuremind/recyclerviewfastscroll/example/adapters/ExampleFragmentsAdapter.java
+++ b/example/src/main/java/com/futuremind/recyclerviewfastscroll/example/adapters/ExampleFragmentsAdapter.java
@@ -1,9 +1,9 @@
 package com.futuremind.recyclerviewfastscroll.example.adapters;
 
 import android.content.Context;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentStatePagerAdapter;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentStatePagerAdapter;
 
 import com.futuremind.recyclerviewfastscroll.example.R;
 import com.futuremind.recyclerviewfastscroll.example.fragments.CustomViewFragment;
diff --git a/example/src/main/java/com/futuremind/recyclerviewfastscroll/example/customview/CustomHandleBehavior.java b/example/src/main/java/com/futuremind/recyclerviewfastscroll/example/customview/CustomHandleBehavior.java
index bb772a1..040f61b 100644
--- a/example/src/main/java/com/futuremind/recyclerviewfastscroll/example/customview/CustomHandleBehavior.java
+++ b/example/src/main/java/com/futuremind/recyclerviewfastscroll/example/customview/CustomHandleBehavior.java
@@ -2,8 +2,8 @@
 
 import android.animation.AnimatorInflater;
 import android.animation.AnimatorSet;
-import android.support.annotation.AnimatorRes;
-import android.support.annotation.Nullable;
+import androidx.annotation.AnimatorRes;
+import androidx.annotation.Nullable;
 import android.view.View;
 
 import com.futuremind.recyclerviewfastscroll.viewprovider.ViewBehavior;
diff --git a/example/src/main/java/com/futuremind/recyclerviewfastscroll/example/customview/CustomScrollerViewProvider.java b/example/src/main/java/com/futuremind/recyclerviewfastscroll/example/customview/CustomScrollerViewProvider.java
index 71fc9e5..4ec2977 100644
--- a/example/src/main/java/com/futuremind/recyclerviewfastscroll/example/customview/CustomScrollerViewProvider.java
+++ b/example/src/main/java/com/futuremind/recyclerviewfastscroll/example/customview/CustomScrollerViewProvider.java
@@ -2,7 +2,7 @@
 
 import android.graphics.drawable.ShapeDrawable;
 import android.graphics.drawable.shapes.OvalShape;
-import android.support.v4.content.ContextCompat;
+import androidx.core.content.ContextCompat;
 import android.view.Gravity;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/example/src/main/java/com/futuremind/recyclerviewfastscroll/example/fragments/ExampleFragment.java b/example/src/main/java/com/futuremind/recyclerviewfastscroll/example/fragments/ExampleFragment.java
index 206868c..4e97162 100644
--- a/example/src/main/java/com/futuremind/recyclerviewfastscroll/example/fragments/ExampleFragment.java
+++ b/example/src/main/java/com/futuremind/recyclerviewfastscroll/example/fragments/ExampleFragment.java
@@ -1,10 +1,10 @@
 package com.futuremind.recyclerviewfastscroll.example.fragments;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -23,8 +23,8 @@ public abstract class ExampleFragment extends Fragment {
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         View layout = LayoutInflater.from(getActivity()).inflate(getLayoutId(), container, false);
 
-        RecyclerView recyclerView = (RecyclerView) layout.findViewById(R.id.recyclerview);
-        fastScroller = (FastScroller) layout.findViewById(R.id.fastscroll);
+        RecyclerView recyclerView = layout.findViewById(R.id.recyclerview);
+        fastScroller = layout.findViewById(R.id.fastscroll);
 
         recyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
         CountriesAdapter adapter = new CountriesAdapter(getActivity());
diff --git a/example/src/main/java/com/futuremind/recyclerviewfastscroll/example/fragments/HorizontalFragment.java b/example/src/main/java/com/futuremind/recyclerviewfastscroll/example/fragments/HorizontalFragment.java
index e85625a..28ac3aa 100644
--- a/example/src/main/java/com/futuremind/recyclerviewfastscroll/example/fragments/HorizontalFragment.java
+++ b/example/src/main/java/com/futuremind/recyclerviewfastscroll/example/fragments/HorizontalFragment.java
@@ -1,10 +1,10 @@
 package com.futuremind.recyclerviewfastscroll.example.fragments;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/example/src/main/res/layout/activity_main.xml b/example/src/main/res/layout/activity_main.xml
index a6553fd..22ca9e0 100644
--- a/example/src/main/res/layout/activity_main.xml
+++ b/example/src/main/res/layout/activity_main.xml
@@ -6,14 +6,14 @@
     android:orientation="vertical"
     tools:context=".MainActivity">
 
-    <android.support.design.widget.TabLayout
+    <com.google.android.material.tabs.TabLayout
         android:id="@+id/tab_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tabIndicatorHeight="4dp"
         app:tabIndicatorColor="#455099"/>
 
-    <android.support.v4.view.ViewPager
+    <androidx.viewpager.widget.ViewPager
         android:id="@+id/pager"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
diff --git a/example/src/main/res/layout/fragment_default.xml b/example/src/main/res/layout/fragment_default.xml
index fe101c9..8574241 100644
--- a/example/src/main/res/layout/fragment_default.xml
+++ b/example/src/main/res/layout/fragment_default.xml
@@ -2,7 +2,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recyclerview"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/example/src/main/res/layout/fragment_horizontal.xml b/example/src/main/res/layout/fragment_horizontal.xml
index 8452b5d..d35cd1b 100644
--- a/example/src/main/res/layout/fragment_horizontal.xml
+++ b/example/src/main/res/layout/fragment_horizontal.xml
@@ -5,7 +5,7 @@
     android:padding="16dp"
     android:background="#cacaca">
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recyclerview"
         android:layout_width="match_parent"
         android:layout_height="0dp"
diff --git a/example/src/main/res/layout/fragment_styled.xml b/example/src/main/res/layout/fragment_styled.xml
index 5d211a5..cb884d1 100644
--- a/example/src/main/res/layout/fragment_styled.xml
+++ b/example/src/main/res/layout/fragment_styled.xml
@@ -3,7 +3,7 @@
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recyclerview"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/fastscroll/build.gradle b/fastscroll/build.gradle
index c195512..be55cab 100644
--- a/fastscroll/build.gradle
+++ b/fastscroll/build.gradle
@@ -3,14 +3,13 @@ apply plugin: 'com.jfrog.bintray'
 apply plugin: 'com.github.dcendents.android-maven'
 
 android {
-    compileSdkVersion rootProject.compileSdkVersion
-    buildToolsVersion rootProject.buildToolsVersion
+    compileSdkVersion 29
 
     resourcePrefix "fastscroll__"
 
     defaultConfig {
         minSdkVersion rootProject.minSdkVersion
-        targetSdkVersion rootProject.targetSdkVersion
+        targetSdkVersion 29
         versionCode rootProject.versionCode
         versionName rootProject.versionName
     }
@@ -143,8 +142,7 @@ bintray {
     }
 }
 
-
 dependencies {
-    compile "com.android.support:appcompat-v7:$supportVersion"
-    compile "com.android.support:recyclerview-v7:$supportVersion"
+    implementation 'androidx.appcompat:appcompat:1.0.2'
+    implementation 'androidx.recyclerview:recyclerview:1.0.0'
 }
diff --git a/fastscroll/src/main/java/com/futuremind/recyclerviewfastscroll/FastScroller.java b/fastscroll/src/main/java/com/futuremind/recyclerviewfastscroll/FastScroller.java
index 13fe55d..22c2b7a 100644
--- a/fastscroll/src/main/java/com/futuremind/recyclerviewfastscroll/FastScroller.java
+++ b/fastscroll/src/main/java/com/futuremind/recyclerviewfastscroll/FastScroller.java
@@ -3,9 +3,9 @@
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.drawable.Drawable;
-import android.support.v4.graphics.drawable.DrawableCompat;
-import android.support.v4.widget.TextViewCompat;
-import android.support.v7.widget.RecyclerView;
+import androidx.core.graphics.drawable.DrawableCompat;
+import androidx.core.widget.TextViewCompat;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.View;
diff --git a/fastscroll/src/main/java/com/futuremind/recyclerviewfastscroll/RecyclerViewScrollListener.java b/fastscroll/src/main/java/com/futuremind/recyclerviewfastscroll/RecyclerViewScrollListener.java
index 5101318..09cc88e 100644
--- a/fastscroll/src/main/java/com/futuremind/recyclerviewfastscroll/RecyclerViewScrollListener.java
+++ b/fastscroll/src/main/java/com/futuremind/recyclerviewfastscroll/RecyclerViewScrollListener.java
@@ -1,13 +1,13 @@
 package com.futuremind.recyclerviewfastscroll;
 
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 
 import java.util.ArrayList;
 import java.util.List;
 
 /**
  * Created by Michal on 04/08/16.
- * Responsible for updating the handle / bubble position when user scrolls the {@link android.support.v7.widget.RecyclerView}.
+ * Responsible for updating the handle / bubble position when user scrolls the {@link RecyclerView}.
  */
 public class RecyclerViewScrollListener extends RecyclerView.OnScrollListener {
 
diff --git a/fastscroll/src/main/java/com/futuremind/recyclerviewfastscroll/Utils.java b/fastscroll/src/main/java/com/futuremind/recyclerviewfastscroll/Utils.java
index 3b259a0..04b7e1d 100644
--- a/fastscroll/src/main/java/com/futuremind/recyclerviewfastscroll/Utils.java
+++ b/fastscroll/src/main/java/com/futuremind/recyclerviewfastscroll/Utils.java
@@ -11,7 +11,6 @@ public class Utils {
 
     public static float getViewRawY(View view) {
         int[] location = new int[2];
-        location[0] = 0;
         location[1] = (int) view.getY();
         ((View)view.getParent()).getLocationInWindow(location);
         return location[1];
@@ -20,7 +19,6 @@ public static float getViewRawY(View view) {
     public static float getViewRawX(View view) {
         int[] location = new int[2];
         location[0] = (int) view.getX();
-        location[1] = 0;
         ((View)view.getParent()).getLocationInWindow(location);
         return location[0];
     }
diff --git a/fastscroll/src/main/java/com/futuremind/recyclerviewfastscroll/viewprovider/DefaultScrollerViewProvider.java b/fastscroll/src/main/java/com/futuremind/recyclerviewfastscroll/viewprovider/DefaultScrollerViewProvider.java
index 369d01d..774168c 100644
--- a/fastscroll/src/main/java/com/futuremind/recyclerviewfastscroll/viewprovider/DefaultScrollerViewProvider.java
+++ b/fastscroll/src/main/java/com/futuremind/recyclerviewfastscroll/viewprovider/DefaultScrollerViewProvider.java
@@ -1,7 +1,7 @@
 package com.futuremind.recyclerviewfastscroll.viewprovider;
 
 import android.graphics.drawable.InsetDrawable;
-import android.support.v4.content.ContextCompat;
+import androidx.core.content.ContextCompat;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/fastscroll/src/main/java/com/futuremind/recyclerviewfastscroll/viewprovider/ScrollerViewProvider.java b/fastscroll/src/main/java/com/futuremind/recyclerviewfastscroll/viewprovider/ScrollerViewProvider.java
index ea24e6d..35b6c0b 100644
--- a/fastscroll/src/main/java/com/futuremind/recyclerviewfastscroll/viewprovider/ScrollerViewProvider.java
+++ b/fastscroll/src/main/java/com/futuremind/recyclerviewfastscroll/viewprovider/ScrollerViewProvider.java
@@ -1,7 +1,7 @@
 package com.futuremind.recyclerviewfastscroll.viewprovider;
 
 import android.content.Context;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
diff --git a/fastscroll/src/main/java/com/futuremind/recyclerviewfastscroll/viewprovider/VisibilityAnimationManager.java b/fastscroll/src/main/java/com/futuremind/recyclerviewfastscroll/viewprovider/VisibilityAnimationManager.java
index 0996e10..be95539 100644
--- a/fastscroll/src/main/java/com/futuremind/recyclerviewfastscroll/viewprovider/VisibilityAnimationManager.java
+++ b/fastscroll/src/main/java/com/futuremind/recyclerviewfastscroll/viewprovider/VisibilityAnimationManager.java
@@ -4,7 +4,7 @@
 import android.animation.AnimatorInflater;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.AnimatorSet;
-import android.support.annotation.AnimatorRes;
+import androidx.annotation.AnimatorRes;
 import android.view.View;
 
 import com.futuremind.recyclerviewfastscroll.R;
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 84d643b..1b3c94c 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Dec 28 11:50:15 CET 2016
+#Sun Jun 23 18:48:06 IRDT 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip