From 25bedc4f2b76e6d31a3488d3e2e26dff45003bae Mon Sep 17 00:00:00 2001
From: Agustin Villafane <agusvillafane@yahoo.com.ar>
Date: Sat, 17 Jul 2021 15:47:32 -0300
Subject: [PATCH] Upgraded the project to AndroidX and latest library
 dependencies

---
 build.gradle                                  | 30 ++++++++++++-------
 demo/build.gradle                             | 12 ++++----
 .../slidinguppanel/demo/DemoActivity.java     |  4 +--
 demo/src/main/res/layout/activity_demo.xml    |  2 +-
 gradle.properties                             |  2 ++
 gradle/wrapper/gradle-wrapper.properties      |  6 ++--
 library/build.gradle                          | 10 +++----
 .../slidinguppanel/ScrollableViewHelper.java  |  2 +-
 .../slidinguppanel/SlidingUpPanelLayout.java  |  4 +--
 .../slidinguppanel/ViewDragHelper.java        |  8 ++---
 10 files changed, 46 insertions(+), 34 deletions(-)

diff --git a/build.gradle b/build.gradle
index 53d5638f..1764bf1f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,11 +1,19 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
   repositories {
-    jcenter()
-  }
+    google()
+    mavenCentral()
+    maven {
+      url 'https://maven.google.com/'
+      name 'Google'
+    }
 
+  }
   dependencies {
-    classpath 'com.android.tools.build:gradle:2.3.2'
+    classpath "com.android.tools.build:gradle:4.2.2"
+
+    // NOTE: Do not place your application dependencies here; they belong
+    // in the individual module build.gradle files
   }
 }
 
@@ -18,14 +26,16 @@ allprojects {
     group = GROUP
 
     repositories {
-      jcenter()
-      maven {
-        url "https://maven.google.com"
+      repositories {
+        google()
+        mavenCentral()
+        maven {
+          url 'https://maven.google.com/'
+          name 'Google'
+        }
+
       }
+      google()
     }
 }
 
-task wrapper(type: Wrapper) {
-  gradleVersion = '3.3'
-  distributionUrl = "https://services.gradle.org/distributions/gradle-${gradleVersion}-all.zip"
-}
diff --git a/demo/build.gradle b/demo/build.gradle
index 02b6f063..99b6018c 100644
--- a/demo/build.gradle
+++ b/demo/build.gradle
@@ -1,8 +1,8 @@
 apply plugin: 'com.android.application'
 
 android {
-  compileSdkVersion 26
-  buildToolsVersion "26.0.1"
+  compileSdkVersion 30
+  buildToolsVersion "26.0.3"
 
   lintOptions {
     abortOnError false
@@ -10,12 +10,12 @@ android {
 
   defaultConfig {
     minSdkVersion 14
-    targetSdkVersion 26
+    targetSdkVersion 30
   }
 }
 
 dependencies {
-  compile 'com.android.support:support-v4:26.0.2'
-  compile 'com.android.support:appcompat-v7:26.0.2'
-  compile project(':library')
+  implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+  implementation 'androidx.appcompat:appcompat:1.3.0'
+  implementation project(':library')
 }
diff --git a/demo/src/main/java/com/sothree/slidinguppanel/demo/DemoActivity.java b/demo/src/main/java/com/sothree/slidinguppanel/demo/DemoActivity.java
index 2f95fe8f..e92281e1 100644
--- a/demo/src/main/java/com/sothree/slidinguppanel/demo/DemoActivity.java
+++ b/demo/src/main/java/com/sothree/slidinguppanel/demo/DemoActivity.java
@@ -3,8 +3,8 @@
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 import android.text.Html;
 import android.text.method.LinkMovementMethod;
 import android.util.Log;
diff --git a/demo/src/main/res/layout/activity_demo.xml b/demo/src/main/res/layout/activity_demo.xml
index b4d5a374..755d1979 100644
--- a/demo/src/main/res/layout/activity_demo.xml
+++ b/demo/src/main/res/layout/activity_demo.xml
@@ -18,7 +18,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical">
-        <android.support.v7.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar
             xmlns:sothree="http://schemas.android.com/apk/res-auto"
             xmlns:android="http://schemas.android.com/apk/res/android"
             android:id="@+id/main_toolbar"
diff --git a/gradle.properties b/gradle.properties
index 65cfc38e..ded20523 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -12,3 +12,5 @@ POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt
 POM_LICENCE_DIST=repo
 POM_DEVELOPER_ID=tokudu
 POM_DEVELOPER_NAME=Anton Lopyrev
+android.useAndroidX=true
+android.enableJetifier=true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index a390e815..fd0cfbc6 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Aug 23 22:44:32 CEST 2016
+#Sat Jul 17 15:09:41 ART 2021
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+zipStoreBase=GRADLE_USER_HOME
diff --git a/library/build.gradle b/library/build.gradle
index d6a4eef5..567f73fc 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -1,18 +1,18 @@
 apply plugin: 'com.android.library'
 
 repositories {
-    jcenter()
+
 }
 
 dependencies {
-   compile 'com.android.support:support-v4:26.0.2'
-    compile 'com.android.support:support-annotations:26.0.2'
-    compile 'com.android.support:recyclerview-v7:26.0.2'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation 'androidx.annotation:annotation:1.2.0'
+    implementation 'androidx.recyclerview:recyclerview:1.2.1'
 }
 
 android {
     compileSdkVersion 26
-    buildToolsVersion "26.0.1"
+    buildToolsVersion "26.0.3"
     lintOptions {
         abortOnError false
     }
diff --git a/library/src/main/java/com/sothree/slidinguppanel/ScrollableViewHelper.java b/library/src/main/java/com/sothree/slidinguppanel/ScrollableViewHelper.java
index 2cf72ad1..64bd62f6 100644
--- a/library/src/main/java/com/sothree/slidinguppanel/ScrollableViewHelper.java
+++ b/library/src/main/java/com/sothree/slidinguppanel/ScrollableViewHelper.java
@@ -1,6 +1,6 @@
 package com.sothree.slidinguppanel;
 
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 import android.widget.ListView;
 import android.widget.ScrollView;
diff --git a/library/src/main/java/com/sothree/slidinguppanel/SlidingUpPanelLayout.java b/library/src/main/java/com/sothree/slidinguppanel/SlidingUpPanelLayout.java
index 424a008c..639397a6 100644
--- a/library/src/main/java/com/sothree/slidinguppanel/SlidingUpPanelLayout.java
+++ b/library/src/main/java/com/sothree/slidinguppanel/SlidingUpPanelLayout.java
@@ -10,8 +10,8 @@
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.os.Parcelable;
-import android.support.v4.view.MotionEventCompat;
-import android.support.v4.view.ViewCompat;
+import androidx.core.view.MotionEventCompat;
+import androidx.core.view.ViewCompat;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.Gravity;
diff --git a/library/src/main/java/com/sothree/slidinguppanel/ViewDragHelper.java b/library/src/main/java/com/sothree/slidinguppanel/ViewDragHelper.java
index 58a4e82a..cef4eac9 100644
--- a/library/src/main/java/com/sothree/slidinguppanel/ViewDragHelper.java
+++ b/library/src/main/java/com/sothree/slidinguppanel/ViewDragHelper.java
@@ -18,10 +18,10 @@
 package com.sothree.slidinguppanel;
 
 import android.content.Context;
-import android.support.v4.view.MotionEventCompat;
-import android.support.v4.view.VelocityTrackerCompat;
-import android.support.v4.view.ViewCompat;
-import android.support.v4.widget.ScrollerCompat;
+import androidx.core.view.MotionEventCompat;
+import androidx.core.view.VelocityTrackerCompat;
+import androidx.core.view.ViewCompat;
+import androidx.core.widget.ScrollerCompat;
 import android.view.MotionEvent;
 import android.view.VelocityTracker;
 import android.view.View;