Migrate to AndroidX

app/build.gradle

@@ -7,7 +7,7 @@ android {
     defaultConfig {
         applicationId "com.getkeepsafe.taptargetviewsample"
         minSdkVersion 14
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
     }
@@ -21,7 +21,7 @@ android {
 
 dependencies {
     implementation project(':taptargetview')
-    implementation "com.android.support:appcompat-v7:$defSupportLibraryVersion"
-    implementation "com.android.support:design:$defSupportLibraryVersion"
+    implementation "androidx.appcompat:appcompat:$defAndroidXVersion"
+    implementation "com.google.android.material:material:$defMaterialVersion"
     implementation 'com.facebook.stetho:stetho:1.5.0'
 }

app/src/main/java/com/getkeepsafe/taptargetviewsample/MainActivity.java

@@ -5,10 +5,10 @@
 import android.graphics.Typeface;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+import androidx.core.content.ContextCompat;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 import android.text.SpannableString;
 import android.text.style.StyleSpan;
 import android.text.style.UnderlineSpan;

app/src/main/res/layout/activity_main.xml

@@ -11,7 +11,7 @@
         android:layout_height="250dp"
         android:background="#444444">
 
-        <android.support.v7.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -43,7 +43,7 @@
 
         </LinearLayout>
 
-        <android.support.design.widget.FloatingActionButton
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
             android:id="@+id/fab"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"

build.gradle

@@ -4,16 +4,17 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.0'
+        classpath 'com.android.tools.build:gradle:3.2.0'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
+        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
     }
 }
 
 ext {
-    defBuildToolsVersion = "27.0.3"
-    defSupportLibraryVersion = '27.0.2'
-    defCompileSdkVersion = 27
+    defBuildToolsVersion = "28.0.2"
+    defAndroidXVersion = '1.0.0'
+    defMaterialVersion = '1.0.0'
+    defCompileSdkVersion = 28
 }
 
 allprojects {

gradle.properties

@@ -0,0 +1,2 @@
+android.enableJetifier=true
+android.useAndroidX=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Wed Jan 31 15:25:02 CET 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.5-bin.zip

taptargetview/build.gradle

@@ -17,9 +17,9 @@ android {
 }
 
 dependencies {
-    api "com.android.support:support-annotations:$defSupportLibraryVersion"
-    api "com.android.support:appcompat-v7:$defSupportLibraryVersion"
-    implementation "com.android.support:support-compat:$defSupportLibraryVersion"
+    api "androidx.annotation:annotation:$defAndroidXVersion"
+    api "androidx.appcompat:appcompat:$defAndroidXVersion"
+    implementation "androidx.core:core:$defAndroidXVersion"
 }
 
 install {

taptargetview/src/main/java/com/getkeepsafe/taptargetview/TapTarget.java

@@ -19,13 +19,13 @@
 import android.graphics.Rect;
 import android.graphics.Typeface;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.ColorInt;
-import android.support.annotation.ColorRes;
-import android.support.annotation.DimenRes;
-import android.support.annotation.IdRes;
-import android.support.annotation.Nullable;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.ColorInt;
+import androidx.annotation.ColorRes;
+import androidx.annotation.DimenRes;
+import androidx.annotation.IdRes;
+import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
+import androidx.appcompat.widget.Toolbar;
 import android.view.View;
 
 /**

taptargetview/src/main/java/com/getkeepsafe/taptargetview/TapTargetSequence.java

@@ -17,8 +17,8 @@
 
 import android.app.Activity;
 import android.app.Dialog;
-import android.support.annotation.Nullable;
-import android.support.annotation.UiThread;
+import androidx.annotation.Nullable;
+import androidx.annotation.UiThread;
 
 import java.util.Collections;
 import java.util.LinkedList;

taptargetview/src/main/java/com/getkeepsafe/taptargetview/TapTargetView.java

@@ -37,7 +37,7 @@
 import android.graphics.Typeface;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.text.DynamicLayout;
 import android.text.Layout;
 import android.text.SpannableStringBuilder;

taptargetview/src/main/java/com/getkeepsafe/taptargetview/ToolbarTapTarget.java

@@ -18,9 +18,9 @@
 import android.annotation.TargetApi;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
-import android.support.annotation.IdRes;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.IdRes;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.Toolbar;
 import android.text.TextUtils;
 import android.view.View;
 import android.view.ViewGroup;

taptargetview/src/main/java/com/getkeepsafe/taptargetview/UiUtil.java

@@ -17,9 +17,9 @@
 
 import android.content.Context;
 import android.content.res.Resources;
-import android.os.Build;
-import android.support.annotation.ColorRes;
-import android.support.annotation.DimenRes;
+
+import androidx.annotation.ColorRes;
+import androidx.annotation.DimenRes;
 import android.util.TypedValue;
 
 class UiUtil {

taptargetview/src/main/java/com/getkeepsafe/taptargetview/ViewTapTarget.java

@@ -19,7 +19,7 @@
 import android.graphics.Canvas;
 import android.graphics.Rect;
 import android.graphics.drawable.BitmapDrawable;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.View;
 
 class ViewTapTarget extends TapTarget {

taptargetview/src/main/java/com/getkeepsafe/taptargetview/ViewUtil.java

@@ -16,7 +16,7 @@
 package com.getkeepsafe.taptargetview;
 
 import android.os.Build;
-import android.support.v4.view.ViewCompat;
+import androidx.core.view.ViewCompat;
 import android.view.View;
 import android.view.ViewManager;
 import android.view.ViewTreeObserver;