diff --git a/build.gradle b/build.gradle
index 1ea4bd0..0cc143e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,9 +3,10 @@
 buildscript {
     repositories {
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.0'
+        classpath 'com.android.tools.build:gradle:3.5.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -15,6 +16,7 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
+        google()
     }
 }
 
diff --git a/demo/build.gradle b/demo/build.gradle
index da874f3..11f1dc8 100644
--- a/demo/build.gradle
+++ b/demo/build.gradle
@@ -2,7 +2,6 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 25
-    buildToolsVersion "25.0.2"
 
     defaultConfig {
         applicationId "com.michaelflisar.dragselectrecyclerview.demo"
@@ -22,8 +21,9 @@ android {
 
 dependencies {
 
-    compile project(':library')
+    implementation project(':library')
 
-    compile "com.android.support:appcompat-v7:25.2.0"
+    implementation "com.android.support:appcompat-v7:25.2.0"
+    implementation "com.android.support:recyclerview-v7:25.2.0"
 
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0dd4fa6..5f86fb3 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sat Mar 04 17:15:41 CET 2017
+#Fri Feb 14 10:52:43 CST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
diff --git a/library/build.gradle b/library/build.gradle
index 11438b8..deaa828 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -16,7 +16,6 @@ android {
     else
     {
         compileSdkVersion 25
-        buildToolsVersion "25.0.2"
         defaultConfig {
             minSdkVersion 16
             targetSdkVersion 25
@@ -37,7 +36,7 @@ android {
 }
 
 dependencies {
-    compile "com.android.support:support-core-ui:${versions.supportLib}"
+    implementation "com.android.support:support-core-ui:${versions.supportLib}"
 //    compile "com.android.support:appcompat-v7:${versions.supportLib}"
-    compile "com.android.support:recyclerview-v7:${versions.supportLib}"
+    implementation "com.android.support:recyclerview-v7:${versions.supportLib}"
 }
\ No newline at end of file
diff --git a/library/src/main/java/com/michaelflisar/dragselectrecyclerview/DragSelectTouchListener.java b/library/src/main/java/com/michaelflisar/dragselectrecyclerview/DragSelectTouchListener.java
index a9cc95a..b7edd6e 100644
--- a/library/src/main/java/com/michaelflisar/dragselectrecyclerview/DragSelectTouchListener.java
+++ b/library/src/main/java/com/michaelflisar/dragselectrecyclerview/DragSelectTouchListener.java
@@ -1,15 +1,12 @@
 package com.michaelflisar.dragselectrecyclerview;
 
-import android.content.Context;
 import android.content.res.Resources;
 import android.support.v4.view.MotionEventCompat;
 import android.support.v4.view.ViewCompat;
-import android.support.v4.widget.ScrollerCompat;
 import android.support.v7.widget.RecyclerView;
 import android.util.Log;
 import android.view.MotionEvent;
 import android.view.View;
-import android.view.animation.LinearInterpolator;
 
 /**
  * Created by flisar on 24.01.2017.
@@ -28,13 +25,13 @@ public class DragSelectTouchListener implements RecyclerView.OnItemTouchListener
 
     private OnDragSelectListener mSelectListener;
     private RecyclerView mRecyclerView;
-    private ScrollerCompat mScroller;
+    private boolean mIsScrolling;
     private Runnable mScrollRunnable = new Runnable()
     {
         @Override
         public void run()
         {
-            if (mScroller != null && mScroller.computeScrollOffset())
+            if (mIsScrolling)
             {
                 scrollBy(mScrollDistance);
                 ViewCompat.postOnAnimation(mRecyclerView, mScrollRunnable);
@@ -214,27 +211,20 @@ public void startAutoScroll()
         if (mRecyclerView == null)
             return;
 
-        initScroller(mRecyclerView.getContext());
-        if (mScroller.isFinished())
+        if (!mIsScrolling)
         {
             mRecyclerView.removeCallbacks(mScrollRunnable);
-            mScroller.startScroll(0, mScroller.getCurrY(), 0, 5000, 100000);
+            mIsScrolling = true;
             ViewCompat.postOnAnimation(mRecyclerView, mScrollRunnable);
         }
     }
 
-    private void initScroller(Context context)
-    {
-        if (mScroller == null)
-            mScroller = ScrollerCompat.create(context, new LinearInterpolator());
-    }
-
     public void stopAutoScroll()
     {
-        if (mScroller != null && !mScroller.isFinished())
+        if (mIsScrolling)
         {
             mRecyclerView.removeCallbacks(mScrollRunnable);
-            mScroller.abortAnimation();
+            mIsScrolling = false;
         }
     }