From adc828aa9872f1b441aff8ca2d29a8e71c54aa4e Mon Sep 17 00:00:00 2001
From: OPADA-Eng <m.opada.albosh@gmail.com>
Date: Tue, 23 Jul 2019 11:22:18 +0300
Subject: [PATCH] upgrade to be compatible with androidX

---
 ColorDialog/build.gradle                            |  3 +--
 build.gradle                                        |  4 +++-
 gradle/wrapper/gradle-wrapper.properties            |  4 ++--
 sample/build.gradle                                 | 13 ++++++-------
 .../refactor/sample/colordialog/MainActivity.java   |  3 ++-
 5 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/ColorDialog/build.gradle b/ColorDialog/build.gradle
index 3d358bb..5fb8548 100644
--- a/ColorDialog/build.gradle
+++ b/ColorDialog/build.gradle
@@ -4,7 +4,6 @@ group='com.github.andyxialm'
 
 android {
     compileSdkVersion 24
-    buildToolsVersion "24.0.2"
 
     defaultConfig {
         minSdkVersion 14
@@ -21,5 +20,5 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
 }
diff --git a/build.gradle b/build.gradle
index 69192e9..e8e5074 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,9 +3,10 @@
 buildscript {
     repositories {
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.2'
+        classpath 'com.android.tools.build:gradle:3.4.1'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
 
         // NOTE: Do not place your application dependencies here; they belong
@@ -16,6 +17,7 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
+        google()
     }
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index a9c5131..fddeb5f 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Nov 07 14:24:53 CST 2016
+#Tue Jul 23 11:18:27 EEST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
diff --git a/sample/build.gradle b/sample/build.gradle
index 9d9cb90..883bdf2 100644
--- a/sample/build.gradle
+++ b/sample/build.gradle
@@ -1,13 +1,12 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 22
-    buildToolsVersion "22.0.1"
+    compileSdkVersion 28
 
     defaultConfig {
         applicationId "cn.refactor.sample.colordialog"
         minSdkVersion 14
-        targetSdkVersion 22
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
     }
@@ -20,8 +19,8 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    testCompile 'junit:junit:4.12'
-    compile 'com.android.support:appcompat-v7:22.2.1'
-    compile project(':ColorDialog')
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    testImplementation 'junit:junit:4.12'
+    implementation 'androidx.appcompat:appcompat:1.0.0'
+    implementation project(':ColorDialog')
 }
diff --git a/sample/src/main/java/cn/refactor/sample/colordialog/MainActivity.java b/sample/src/main/java/cn/refactor/sample/colordialog/MainActivity.java
index 38b1e9d..24c4b84 100644
--- a/sample/src/main/java/cn/refactor/sample/colordialog/MainActivity.java
+++ b/sample/src/main/java/cn/refactor/sample/colordialog/MainActivity.java
@@ -2,7 +2,6 @@
 
 import android.content.Context;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 import android.view.animation.AlphaAnimation;
 import android.view.animation.Animation;
@@ -10,6 +9,8 @@
 import android.view.animation.ScaleAnimation;
 import android.widget.Toast;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 import cn.refactor.lib.colordialog.ColorDialog;
 import cn.refactor.lib.colordialog.PromptDialog;