Migrate to AndroidX

core/build.gradle

@@ -3,7 +3,6 @@ apply plugin: 'bintray-release'
 
 android {
     compileSdkVersion versions.androidSdk.compile
-    buildToolsVersion versions.androidSdk.buildTools
 
     defaultConfig {
         minSdkVersion versions.androidSdk.min
@@ -16,7 +15,7 @@ android {
 }
 
 dependencies {
-    implementation libraries.supportAppCompatV7
+    implementation libraries.appcompat
 
     testImplementation libraries.jUnit
     testImplementation libraries.mockitoCore

core/src/main/java/com/novoda/accessibility/Action.java

@@ -1,9 +1,10 @@
 package com.novoda.accessibility;
 
-import android.support.annotation.IdRes;
-import android.support.annotation.StringRes;
 import android.view.View;
 
+import androidx.annotation.IdRes;
+import androidx.annotation.StringRes;
+
 public class Action {
 
     @IdRes

core/src/main/java/com/novoda/accessibility/ActionMenuItem.java

@@ -3,10 +3,15 @@
 import android.content.Intent;
 import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.Nullable;
-import android.support.annotation.StringRes;
 import android.util.Log;
-import android.view.*;
+import android.view.ActionProvider;
+import android.view.ContextMenu;
+import android.view.MenuItem;
+import android.view.SubMenu;
+import android.view.View;
+
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
 
 class ActionMenuItem implements MenuItem {
 

core/src/main/java/com/novoda/accessibility/Actions.java

@@ -1,7 +1,7 @@
 package com.novoda.accessibility;
 
-import android.support.annotation.IdRes;
-import android.support.annotation.Nullable;
+import androidx.annotation.IdRes;
+import androidx.annotation.Nullable;
 
 import java.util.Iterator;
 import java.util.List;

core/src/main/java/com/novoda/accessibility/ActionsAccessibilityDelegate.java

@@ -2,11 +2,12 @@
 
 import android.content.res.Resources;
 import android.os.Bundle;
-import android.support.annotation.StringRes;
-import android.support.v4.view.AccessibilityDelegateCompat;
-import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat;
 import android.view.View;
 
+import androidx.annotation.StringRes;
+import androidx.core.view.AccessibilityDelegateCompat;
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
+
 public class ActionsAccessibilityDelegate extends AccessibilityDelegateCompat {
 
     private final Resources resources;

core/src/main/java/com/novoda/accessibility/ActionsAlertDialogCreator.java

@@ -1,9 +1,9 @@
 package com.novoda.accessibility;
 
 import android.content.Context;
-import android.content.DialogInterface;
-import android.support.annotation.StringRes;
-import android.support.v7.app.AlertDialog;
+
+import androidx.annotation.StringRes;
+import androidx.appcompat.app.AlertDialog;
 
 public class ActionsAlertDialogCreator {
 

core/src/main/java/com/novoda/accessibility/ActionsMenu.java

@@ -3,13 +3,14 @@
 import android.content.ComponentName;
 import android.content.Intent;
 import android.content.res.Resources;
-import android.support.annotation.Nullable;
-import android.support.annotation.StringRes;
 import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.SubMenu;
 
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+
 import java.util.ArrayList;
 import java.util.List;
 

core/src/main/java/com/novoda/accessibility/ActionsMenuAccessibilityDelegate.java

@@ -2,12 +2,13 @@
 
 import android.content.res.Resources;
 import android.os.Bundle;
-import android.support.v4.view.AccessibilityDelegateCompat;
-import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 
+import androidx.core.view.AccessibilityDelegateCompat;
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
+
 public class ActionsMenuAccessibilityDelegate extends AccessibilityDelegateCompat {
 
     private final Menu menu;

core/src/main/java/com/novoda/accessibility/ActionsMenuAlertDialog.java

@@ -1,10 +1,11 @@
 package com.novoda.accessibility;
 
 import android.content.Context;
-import android.support.v7.app.AlertDialog;
 import android.view.Menu;
 import android.view.MenuItem;
 
+import androidx.appcompat.app.AlertDialog;
+
 public class ActionsMenuAlertDialog {
 
     public static AlertDialog.Builder create(Context context, Menu menu, MenuItem.OnMenuItemClickListener menuItemClickListener) {

core/src/main/java/com/novoda/accessibility/ActionsMenuInflater.java

@@ -2,11 +2,12 @@
 
 import android.content.Context;
 import android.content.res.Resources;
-import android.support.annotation.MenuRes;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 
+import androidx.annotation.MenuRes;
+
 public class ActionsMenuInflater {
 
     private final MenuInflater menuInflater;

core/src/main/java/com/novoda/accessibility/UsageHints.java

@@ -1,12 +1,13 @@
 package com.novoda.accessibility;
 
 import android.content.res.Resources;
-import android.support.annotation.StringRes;
-import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat;
 import android.view.View;
 
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_CLICK;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_LONG_CLICK;
+import androidx.annotation.StringRes;
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
+
+import static androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_CLICK;
+import static androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_LONG_CLICK;
 
 public class UsageHints {
 

core/src/main/java/com/novoda/accessibility/UsageHintsAccessibilityDelegate.java

@@ -1,11 +1,12 @@
 package com.novoda.accessibility;
 
 import android.content.res.Resources;
-import android.support.annotation.StringRes;
-import android.support.v4.view.AccessibilityDelegateCompat;
-import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat;
 import android.view.View;
 
+import androidx.annotation.StringRes;
+import androidx.core.view.AccessibilityDelegateCompat;
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
+
 public class UsageHintsAccessibilityDelegate extends AccessibilityDelegateCompat {
 
     private final UsageHints usageHints;

demo/build.gradle

@@ -2,7 +2,6 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion versions.androidSdk.compile
-    buildToolsVersion versions.androidSdk.buildTools
 
     defaultConfig {
         applicationId 'com.novoda.accessibility.demo'
@@ -20,5 +19,5 @@ android {
 
 dependencies {
     implementation project(':core')
-    implementation libraries.supportAppCompatV7
+    implementation libraries.appcompat
 }

demo/src/main/java/com/novoda/accessibility/demo/AccessibilityServicesActivity.java

@@ -1,9 +1,10 @@
 package com.novoda.accessibility.demo;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
 import android.widget.TextView;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 import com.novoda.accessibility.AccessibilityServices;
 
 public class AccessibilityServicesActivity extends AppCompatActivity {

demo/src/main/java/com/novoda/accessibility/demo/DemosActivity.java

@@ -1,9 +1,10 @@
 package com.novoda.accessibility.demo;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
 import android.widget.ListView;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 import com.novoda.accessibility.demo.base.Demo;
 import com.novoda.accessibility.demo.base.DemoAdapter;
 import com.novoda.accessibility.demo.custom_actions.CustomActionsActivity;

demo/src/main/java/com/novoda/accessibility/demo/custom_actions/CustomActionsActivity.java

@@ -1,9 +1,10 @@
 package com.novoda.accessibility.demo.custom_actions;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
 import android.widget.Toast;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 import com.novoda.accessibility.demo.R;
 
 public class CustomActionsActivity extends AppCompatActivity {

demo/src/main/java/com/novoda/accessibility/demo/custom_actions/TweetView.java

@@ -1,16 +1,22 @@
 package com.novoda.accessibility.demo.custom_actions;
 
 import android.content.Context;
-import android.support.v4.view.AccessibilityDelegateCompat;
-import android.support.v4.view.ViewCompat;
-import android.support.v7.app.AlertDialog;
 import android.util.AttributeSet;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
-import com.novoda.accessibility.*;
+
+import androidx.appcompat.app.AlertDialog;
+import androidx.core.view.AccessibilityDelegateCompat;
+import androidx.core.view.ViewCompat;
+
+import com.novoda.accessibility.AccessibilityServices;
+import com.novoda.accessibility.ActionsMenuAccessibilityDelegate;
+import com.novoda.accessibility.ActionsMenuAlertDialog;
+import com.novoda.accessibility.ActionsMenuInflater;
+import com.novoda.accessibility.UsageHints;
 import com.novoda.accessibility.demo.R;
 
 public class TweetView extends LinearLayout {

dependencies.gradle

@@ -1,21 +1,20 @@
 ext {
     versions = [
-            androidSdk    : [
-                    compile   : 27,
-                    min       : 16,
-                    target    : 27,
-                    buildTools: '27.0.3'
+            androidSdk: [
+                    compile: 28,
+                    min    : 16,
+                    target : 28
             ]
     ]
 
     libraries = [
-            build             : [
-                    androidGradle : 'com.android.tools.build:gradle:3.0.1',
+            build         : [
+                    androidGradle : 'com.android.tools.build:gradle:3.3.1',
                     bintrayRelease: 'com.novoda:bintray-release:0.8.0'
             ],
-            assertJAndroid    : 'com.squareup.assertj:assertj-android:1.1.0',
-            jUnit             : 'junit:junit:4.12',
-            supportAppCompatV7: 'com.android.support:appcompat-v7:27.0.2',
-            mockitoCore       : 'org.mockito:mockito-core:2.13.0'
+            appcompat     : 'androidx.appcompat:appcompat:1.0.0',
+            assertJAndroid: 'com.squareup.assertj:assertj-android:1.1.0',
+            jUnit         : 'junit:junit:4.12',
+            mockitoCore   : 'org.mockito:mockito-core:2.13.0'
     ]
 }

gradle.properties

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

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
+#Sun Feb 17 10:54:30 GMT 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip