Merge pull request #101 from kstanislav/master

added androidX support bumped sdk and tools version

Author: romandanylyk

build.gradle

@@ -6,8 +6,8 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.4'
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.1'
+        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

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
+# org.gradle.parallel=true
+android.enableJetifier=false
+android.useAndroidX=true

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip

pageindicatorview/build.gradle

@@ -25,16 +25,16 @@ ext {
 }
 
 android {
-    compileSdkVersion 27
-    buildToolsVersion '27.0.3'
+    compileSdkVersion 28
+    buildToolsVersion '28.0.3'
 
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
     }
     buildTypes {
@@ -49,9 +49,9 @@ dependencies {
     repositories {
         maven { url "https://maven.google.com" }
     }
-    implementation 'com.android.support:support-annotations:27.1.1'
-    implementation 'com.android.support:support-compat:27.1.1'
-    implementation 'com.android.support:support-core-ui:27.1.1'
+    implementation 'androidx.annotation:annotation:1.0.0'
+    implementation 'androidx.core:core:1.0.0'
+    implementation 'androidx.viewpager:viewpager:1.0.0'
 }
 
 allprojects {

pageindicatorview/src/main/java/com/rd/IndicatorManager.java

@@ -1,6 +1,6 @@
 package com.rd;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.rd.animation.AnimationManager;
 import com.rd.animation.controller.ValueController;
 import com.rd.animation.data.Value;

pageindicatorview/src/main/java/com/rd/PageIndicatorView.java

@@ -9,12 +9,12 @@
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.text.TextUtilsCompat;
-import android.support.v4.view.PagerAdapter;
-import android.support.v4.view.ViewCompat;
-import android.support.v4.view.ViewPager;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.text.TextUtilsCompat;
+import androidx.viewpager.widget.PagerAdapter;
+import androidx.core.view.ViewCompat;
+import androidx.viewpager.widget.ViewPager;
 import android.util.AttributeSet;
 import android.util.Pair;
 import android.view.MotionEvent;

pageindicatorview/src/main/java/com/rd/animation/AnimationManager.java

@@ -1,6 +1,6 @@
 package com.rd.animation;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import com.rd.animation.controller.AnimationController;
 import com.rd.animation.controller.ValueController;
 import com.rd.draw.data.Indicator;

pageindicatorview/src/main/java/com/rd/animation/controller/AnimationController.java

@@ -1,6 +1,6 @@
 package com.rd.animation.controller;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import com.rd.animation.type.AnimationType;
 import com.rd.animation.type.BaseAnimation;
 import com.rd.draw.data.Indicator;

pageindicatorview/src/main/java/com/rd/animation/controller/ValueController.java

@@ -1,7 +1,7 @@
 package com.rd.animation.controller;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import com.rd.animation.data.Value;
 import com.rd.animation.type.*;
 

pageindicatorview/src/main/java/com/rd/animation/data/AnimationValue.java

@@ -1,6 +1,6 @@
 package com.rd.animation.data;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import com.rd.animation.data.type.*;
 
 public class AnimationValue {