Migrate to AndroidX.

README.md

@@ -7,6 +7,16 @@ A container of toggle buttons, supports multiple / single selection and button c
 
 ## Gradle
 
+AndroidX:
+
+```
+dependencies {
+    implementation 'com.nex3z:toggle-button-group:1.2.0'
+}
+```
+
+AppCompact:
+
 ```
 dependencies {
     implementation 'com.nex3z:toggle-button-group:1.1.9'

build.gradle

@@ -6,8 +6,8 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
-        classpath 'com.novoda:bintray-release:0.9'
+        classpath 'com.android.tools.build:gradle:3.4.2'
+        classpath 'com.novoda:bintray-release:0.9.1'
     }
 }
 

gradle.properties

@@ -16,7 +16,10 @@ org.gradle.jvmargs=-Xmx1536m
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 
-PUBLISH_VERSION=1.1.7
+android.useAndroidX=true
+android.enableJetifier=true
+
+PUBLISH_VERSION=1.2.0
 USER_ORG=nex3z
 GROUP_ID=com.nex3z
 ARTIFACT_ID=toggle-button-group

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri Dec 28 20:38:24 CST 2018
+#Sat Jul 27 22:50:59 CST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip

sample/build.gradle

@@ -9,7 +9,7 @@ android {
         targetSdkVersion 28
         versionCode 1
         versionName "1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
         release {
@@ -22,9 +22,8 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation project(path: ':togglebuttongroup')
-    implementation 'com.android.support:appcompat-v7:28.0.0'
-
+    implementation 'androidx.appcompat:appcompat:1.0.2'
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    androidTestImplementation 'androidx.test:runner:1.2.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
 }

sample/src/androidTest/java/com/nex3z/togglebuttongroup/ExampleInstrumentedTest.java

@@ -1,8 +1,8 @@
 package com.nex3z.togglebuttongroup;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

sample/src/main/java/com/nex3z/togglebuttongroup/sample/CustomButtonActivity.java

@@ -1,7 +1,7 @@
 package com.nex3z.togglebuttongroup.sample;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.util.Log;
 
 import com.nex3z.togglebuttongroup.MultiSelectToggleGroup;

sample/src/main/java/com/nex3z/togglebuttongroup/sample/FlowLabelActivity.java

@@ -1,7 +1,7 @@
 package com.nex3z.togglebuttongroup.sample;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.util.Log;
 
 import com.nex3z.togglebuttongroup.MultiSelectToggleGroup;

sample/src/main/java/com/nex3z/togglebuttongroup/sample/MainActivity.java

@@ -2,7 +2,7 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 
 public class MainActivity extends AppCompatActivity {

sample/src/main/java/com/nex3z/togglebuttongroup/sample/MultiSelectActivity.java

@@ -1,7 +1,7 @@
 package com.nex3z.togglebuttongroup.sample;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.util.Log;
 
 import com.nex3z.togglebuttongroup.MultiSelectToggleGroup;

sample/src/main/java/com/nex3z/togglebuttongroup/sample/SingleSelectActivity.java

@@ -1,7 +1,7 @@
 package com.nex3z.togglebuttongroup.sample;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.util.Log;
 
 import com.nex3z.togglebuttongroup.SingleSelectToggleGroup;

sample/src/main/java/com/nex3z/togglebuttongroup/sample/button/CustomToggleButton.java

@@ -1,7 +1,7 @@
 package com.nex3z.togglebuttongroup.sample.button;
 
 import android.content.Context;
-import android.support.v7.widget.AppCompatButton;
+import androidx.appcompat.widget.AppCompatButton;
 import android.util.AttributeSet;
 
 import com.nex3z.togglebuttongroup.button.OnCheckedChangeListener;

togglebuttongroup/build.gradle

@@ -10,7 +10,7 @@ android {
         versionCode 1
         versionName "1.0"
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
         release {
@@ -30,9 +30,8 @@ publish {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.android.support:appcompat-v7:28.0.0'
-
+    implementation 'androidx.appcompat:appcompat:1.0.2'
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    androidTestImplementation 'androidx.test:runner:1.2.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
 }

togglebuttongroup/src/androidTest/java/com/nex3z/togglebuttongroup/ExampleInstrumentedTest.java

@@ -1,8 +1,8 @@
 package com.nex3z.togglebuttongroup;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

togglebuttongroup/src/main/java/com/nex3z/togglebuttongroup/button/CircularToggle.java

@@ -5,7 +5,7 @@
 import android.content.Context;
 import android.content.res.ColorStateList;
 import android.graphics.drawable.GradientDrawable;
-import android.support.v4.content.ContextCompat;
+import androidx.core.content.ContextCompat;
 import android.util.AttributeSet;
 import android.view.animation.Animation;
 import android.view.animation.ScaleAnimation;

togglebuttongroup/src/main/java/com/nex3z/togglebuttongroup/button/CompoundToggleButton.java

@@ -1,7 +1,7 @@
 package com.nex3z.togglebuttongroup.button;
 
 import android.content.Context;
-import android.support.annotation.CallSuper;
+import androidx.annotation.CallSuper;
 import android.util.AttributeSet;
 import android.widget.FrameLayout;
 

togglebuttongroup/src/main/java/com/nex3z/togglebuttongroup/button/LabelToggle.java

@@ -5,14 +5,12 @@
 import android.content.Context;
 import android.content.res.ColorStateList;
 import android.graphics.drawable.GradientDrawable;
-import android.support.v4.content.ContextCompat;
+import androidx.core.content.ContextCompat;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.animation.AlphaAnimation;
 import android.view.animation.Animation;
 
-import com.nex3z.togglebuttongroup.R;
-
 public class LabelToggle extends MarkerButton implements ToggleButton {
     private static final String LOG_TAG = LabelToggle.class.getSimpleName();
 

togglebuttongroup/src/main/java/com/nex3z/togglebuttongroup/button/MarkerButton.java

@@ -4,7 +4,7 @@
 import android.content.res.ColorStateList;
 import android.content.res.TypedArray;
 import android.graphics.drawable.Drawable;
-import android.support.v4.content.ContextCompat;
+import androidx.core.content.ContextCompat;
 import android.util.AttributeSet;
 import android.util.TypedValue;
 import android.view.LayoutInflater;