Update codebase to be androidX compliant (#94)

tobrun · web-flow · commit c6e02b7edfd1 · 2020-01-08T15:54:16.000+01:00
diff --git a/app/build.gradle b/app/build.gradle
@@ -11,7 +11,7 @@ android {
         targetSdkVersion androidVersions.targetSdkVersion
         versionCode 1
         versionName "0.1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     compileOptions {
diff --git a/app/src/androidTest/java/com/mapbox/android/gestures/GesturesUiTestUtils.kt b/app/src/androidTest/java/com/mapbox/android/gestures/GesturesUiTestUtils.kt
@@ -1,10 +1,10 @@
 import android.graphics.PointF
 import android.os.SystemClock
-import android.support.test.espresso.Espresso
-import android.support.test.espresso.InjectEventSecurityException
-import android.support.test.espresso.UiController
-import android.support.test.espresso.ViewAction
-import android.support.test.espresso.matcher.ViewMatchers
+import androidx.test.espresso.Espresso
+import androidx.test.espresso.InjectEventSecurityException
+import androidx.test.espresso.UiController
+import androidx.test.espresso.ViewAction
+import androidx.test.espresso.matcher.ViewMatchers
 import android.view.MotionEvent
 import android.view.View
 
diff --git a/app/src/androidTest/java/com/mapbox/android/gestures/MultiFingerTapGestureDetectorTest.kt b/app/src/androidTest/java/com/mapbox/android/gestures/MultiFingerTapGestureDetectorTest.kt
@@ -2,10 +2,10 @@ package com.mapbox.android.gestures
 
 import GesturesUiTestUtils.DEFAULT_GESTURE_DURATION
 import GesturesUiTestUtils.twoTap
-import android.support.test.espresso.Espresso
-import android.support.test.espresso.matcher.ViewMatchers
-import android.support.test.rule.ActivityTestRule
-import android.support.test.runner.AndroidJUnit4
+import androidx.test.espresso.Espresso
+import androidx.test.espresso.matcher.ViewMatchers
+import androidx.test.rule.ActivityTestRule
+import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.mapbox.android.gestures.testapp.R
 import com.mapbox.android.gestures.testapp.TestActivity
 import org.junit.Assert
diff --git a/app/src/androidTest/java/com/mapbox/android/gestures/ScaleGestureDetectorTest.kt b/app/src/androidTest/java/com/mapbox/android/gestures/ScaleGestureDetectorTest.kt
@@ -6,10 +6,10 @@ import GesturesUiTestUtils.pinch
 import GesturesUiTestUtils.quickScale
 import android.os.Build
 import android.os.Handler
-import android.support.test.espresso.Espresso.onView
-import android.support.test.espresso.matcher.ViewMatchers.withId
-import android.support.test.rule.ActivityTestRule
-import android.support.test.runner.AndroidJUnit4
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.rule.ActivityTestRule
+import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.mapbox.android.gestures.testapp.R
 import com.mapbox.android.gestures.testapp.TestActivity
 import org.junit.Assert
diff --git a/app/src/main/java/com/mapbox/android/gestures/testapp/MainActivity.java b/app/src/main/java/com/mapbox/android/gestures/testapp/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.util.DisplayMetrics;
 import android.view.Menu;
 import android.view.MenuInflater;
diff --git a/app/src/main/java/com/mapbox/android/gestures/testapp/MapboxActivity.java b/app/src/main/java/com/mapbox/android/gestures/testapp/MapboxActivity.java
@@ -1,7 +1,7 @@
 package com.mapbox.android.gestures.testapp;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.text.TextUtils;
 
 import com.mapbox.mapboxsdk.Mapbox;
diff --git a/app/src/main/java/com/mapbox/android/gestures/testapp/TestActivity.java b/app/src/main/java/com/mapbox/android/gestures/testapp/TestActivity.java
@@ -1,7 +1,7 @@
 package com.mapbox.android.gestures.testapp;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.MotionEvent;
 
 import com.mapbox.android.gestures.AndroidGesturesManager;
diff --git a/app/src/main/java/com/mapbox/android/gestures/testapp/TestView.java b/app/src/main/java/com/mapbox/android/gestures/testapp/TestView.java
@@ -1,7 +1,7 @@
 package com.mapbox.android.gestures.testapp;
 
 import android.content.Context;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.View;
diff --git a/app/src/main/java/com/mapbox/android/gestures/testapp/Utils.java b/app/src/main/java/com/mapbox/android/gestures/testapp/Utils.java
@@ -1,7 +1,7 @@
 package com.mapbox.android.gestures.testapp;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.mapbox.mapboxsdk.Mapbox;
 
diff --git a/gradle.properties b/gradle.properties
@@ -16,6 +16,8 @@ POM_DEVELOPER_NAME=Mapbox
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
 org.gradle.jvmargs=-Xmx2048M
+android.useAndroidX=true
+android.enableJetifier=true
 
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
@@ -1,20 +1,21 @@
 ext {
     androidVersions = [
             minSdkVersion    : 14,
-            targetSdkVersion : 27,
-            compileSdkVersion: 27,
+            targetSdkVersion : 28,
+            compileSdkVersion: 28,
     ]
 
     version = [
-            mapboxSdkVersion : '8.1.0',
-            supportLibVersion: '27.1.1',
+            mapboxSdkVersion : '8.6.0',
             timber           : '4.7.1',
             junit            : '4.12',
-            mockito          : '2.18.3',
+            mockito          : '3.2.4',
             robolectric      : '4.3',
-            testRunnerVersion: '1.0.2',
-            espressoVersion  : '3.0.2',
+            testRunner       : '1.1.1',
+            espresso         : '3.2.0',
             kotlin           : '1.3.41',
+            appCompat        : '1.0.0',
+            core             : '1.0.0'
     ]
 
     pluginVersion = [
@@ -31,8 +32,8 @@ ext {
             mapboxSdk          : "com.mapbox.mapboxsdk:mapbox-android-sdk:${version.mapboxSdkVersion}",
 
             // support
-            supportAppcompatV7 : "com.android.support:appcompat-v7:${version.supportLibVersion}",
-            supportCompat      : "com.android.support:support-compat:${version.supportLibVersion}",
+            supportAppcompatV7 : "androidx.appcompat:appcompat:${version.appCompat}",
+            supportCompat      : "androidx.core:core:${version.core}",
 
             // timber
             timber             : "com.jakewharton.timber:timber:${version.timber}",
@@ -41,10 +42,10 @@ ext {
             kotlinLib          : "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${version.kotlin}",
 
             // instrumentation test
-            testRunner         : "com.android.support.test:runner:${version.testRunnerVersion}",
-            testRules          : "com.android.support.test:rules:${version.testRunnerVersion}",
-            testEspressoCore   : "com.android.support.test.espresso:espresso-core:${version.espressoVersion}",
-            testEspressoIntents: "com.android.support.test.espresso:espresso-intents:${version.espressoVersion}",
+            testRunner         : "androidx.test.ext:junit:${version.testRunner}",
+            testRules          : "androidx.test:rules:${version.testRunner}",
+            testEspressoCore   : "androidx.test.espresso:espresso-core:${version.espresso}",
+            testEspressoIntents: "androidx.test.espresso:espresso-intents:${version.espresso}",
 
             // unit test
             junit              : "junit:junit:${version.junit}",
@@ -59,6 +60,6 @@ ext {
             bintrayPlugin       : "com.jfrog.bintray.gradle:gradle-bintray-plugin:${pluginVersion.bintray}",
             androidPublishPlugin: "digital.wup:android-maven-publish:${pluginVersion.androidPublish}",
             artifactory         : "org.jfrog.buildinfo:build-info-extractor-gradle:${pluginVersion.artifactory}",
-            kotlinPlugin       : "org.jetbrains.kotlin:kotlin-gradle-plugin:${version.kotlin}"
+            kotlinPlugin        : "org.jetbrains.kotlin:kotlin-gradle-plugin:${version.kotlin}"
     ]
 }
diff --git a/library/build.gradle b/library/build.gradle
@@ -10,7 +10,7 @@ android {
         targetSdkVersion androidVersions.targetSdkVersion
         versionCode 1
         versionName VERSION_NAME
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     compileOptions {
diff --git a/library/src/main/java/com/mapbox/android/gestures/AndroidGesturesManager.java b/library/src/main/java/com/mapbox/android/gestures/AndroidGesturesManager.java
@@ -2,8 +2,8 @@
 
 import android.content.Context;
 import android.os.Build;
-import android.support.annotation.IntDef;
-import android.support.annotation.UiThread;
+import androidx.annotation.IntDef;
+import androidx.annotation.UiThread;
 import android.view.MotionEvent;
 
 import java.lang.annotation.Retention;
@@ -97,7 +97,7 @@ public AndroidGesturesManager(Context context, boolean applyDefaultThresholds) {
    *                          <p>
    *                          At the moment {@link #GESTURE_TYPE_SCROLL} is not interpreted as a progressive gesture
    *                          because it is not implemented this way by the
-   *                          {@link android.support.v4.view.GestureDetectorCompat}.
+   *                          {@link androidx.core.view.GestureDetectorCompat}.
    */
   @SafeVarargs
   public AndroidGesturesManager(Context context, Set<Integer>... exclusiveGestures) {
@@ -114,7 +114,7 @@ public AndroidGesturesManager(Context context, Set<Integer>... exclusiveGestures
    *                               <p>
    *                               At the moment {@link #GESTURE_TYPE_SCROLL} is not interpreted as
    *                               a progressive gesture because it is not implemented this way by the
-   *                               {@link android.support.v4.view.GestureDetectorCompat}.
+   *                               {@link androidx.core.view.GestureDetectorCompat}.
    * @param applyDefaultThresholds if true, default gestures thresholds and adjustments will be applied
    */
   public AndroidGesturesManager(Context context, List<Set<Integer>> exclusiveGestures, boolean applyDefaultThresholds) {
@@ -198,7 +198,7 @@ public boolean onTouchEvent(MotionEvent motionEvent) {
   }
 
   /**
-   * Sets a listener for all the events normally returned by the {@link android.support.v4.view.GestureDetectorCompat}.
+   * Sets a listener for all the events normally returned by the {@link androidx.core.view.GestureDetectorCompat}.
    *
    * @param listener your gestures listener
    * @see <a href="https://developer.android.com/training/gestures/index.html">Using Touch Gestures</a>
@@ -210,7 +210,7 @@ public void setStandardGestureListener(StandardGestureDetector.StandardOnGesture
 
   /**
    * Removes a listener for all the events normally returned by the
-   * {@link android.support.v4.view.GestureDetectorCompat}.
+   * {@link androidx.core.view.GestureDetectorCompat}.
    */
   public void removeStandardGestureListener() {
     standardGestureDetector.removeListener();
@@ -330,7 +330,7 @@ public List<BaseGesture> getDetectors() {
   }
 
   /**
-   * Get gesture detector that wraps {@link android.support.v4.view.GestureDetectorCompat}.
+   * Get gesture detector that wraps {@link androidx.core.view.GestureDetectorCompat}.
    *
    * @return gesture detector
    */
@@ -401,7 +401,7 @@ public SidewaysShoveGestureDetector getSidewaysShoveGestureDetector() {
    *                          <p>
    *                          At the moment {@link #GESTURE_TYPE_SCROLL} is not interpreted as a progressive gesture
    *                          because it is not interpreted this way by the
-   *                          {@link android.support.v4.view.GestureDetectorCompat}.
+   *                          {@link androidx.core.view.GestureDetectorCompat}.
    */
   @SafeVarargs
   public final void setMutuallyExclusiveGestures(Set<Integer>... exclusiveGestures) {
@@ -417,7 +417,7 @@ public final void setMutuallyExclusiveGestures(Set<Integer>... exclusiveGestures
    *                          <p>
    *                          At the moment {@link #GESTURE_TYPE_SCROLL} is not interpreted as a progressive gesture
    *                          because it is not interpreted this way by the
-   *                          {@link android.support.v4.view.GestureDetectorCompat}.
+   *                          {@link androidx.core.view.GestureDetectorCompat}.
    */
   public void setMutuallyExclusiveGestures(List<Set<Integer>> exclusiveGestures) {
     this.mutuallyExclusiveGestures.clear();
diff --git a/library/src/main/java/com/mapbox/android/gestures/BaseGesture.java b/library/src/main/java/com/mapbox/android/gestures/BaseGesture.java
@@ -1,7 +1,7 @@
 package com.mapbox.android.gestures;
 
 import android.content.Context;
-import android.support.annotation.UiThread;
+import androidx.annotation.UiThread;
 import android.view.MotionEvent;
 import android.view.WindowManager;
 
diff --git a/library/src/main/java/com/mapbox/android/gestures/MoveGestureDetector.java b/library/src/main/java/com/mapbox/android/gestures/MoveGestureDetector.java
@@ -2,9 +2,9 @@
 
 import android.content.Context;
 import android.graphics.PointF;
-import android.support.annotation.DimenRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.UiThread;
+import androidx.annotation.DimenRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.UiThread;
 import android.view.MotionEvent;
 
 import java.util.HashMap;
diff --git a/library/src/main/java/com/mapbox/android/gestures/MultiFingerGesture.java b/library/src/main/java/com/mapbox/android/gestures/MultiFingerGesture.java
@@ -3,8 +3,8 @@
 import android.content.Context;
 import android.graphics.PointF;
 import android.os.Build;
-import android.support.annotation.DimenRes;
-import android.support.annotation.UiThread;
+import androidx.annotation.DimenRes;
+import androidx.annotation.UiThread;
 import android.util.DisplayMetrics;
 import android.util.Log;
 import android.view.Display;
diff --git a/library/src/main/java/com/mapbox/android/gestures/MultiFingerTapGestureDetector.java b/library/src/main/java/com/mapbox/android/gestures/MultiFingerTapGestureDetector.java
@@ -1,8 +1,8 @@
 package com.mapbox.android.gestures;
 
 import android.content.Context;
-import android.support.annotation.DimenRes;
-import android.support.annotation.UiThread;
+import androidx.annotation.DimenRes;
+import androidx.annotation.UiThread;
 import android.view.MotionEvent;
 
 import java.util.HashMap;
diff --git a/library/src/main/java/com/mapbox/android/gestures/PermittedActionsGuard.java b/library/src/main/java/com/mapbox/android/gestures/PermittedActionsGuard.java
@@ -1,6 +1,6 @@
 package com.mapbox.android.gestures;
 
-import android.support.annotation.IntRange;
+import androidx.annotation.IntRange;
 import android.view.MotionEvent;
 
 class PermittedActionsGuard {
diff --git a/library/src/main/java/com/mapbox/android/gestures/ProgressiveGesture.java b/library/src/main/java/com/mapbox/android/gestures/ProgressiveGesture.java
@@ -1,8 +1,8 @@
 package com.mapbox.android.gestures;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.UiThread;
+import androidx.annotation.NonNull;
+import androidx.annotation.UiThread;
 import android.view.MotionEvent;
 import android.view.VelocityTracker;
 
diff --git a/library/src/main/java/com/mapbox/android/gestures/RotateGestureDetector.java b/library/src/main/java/com/mapbox/android/gestures/RotateGestureDetector.java
@@ -1,8 +1,8 @@
 package com.mapbox.android.gestures;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.UiThread;
+import androidx.annotation.NonNull;
+import androidx.annotation.UiThread;
 
 import java.util.HashSet;
 import java.util.Set;
diff --git a/library/src/main/java/com/mapbox/android/gestures/ShoveGestureDetector.java b/library/src/main/java/com/mapbox/android/gestures/ShoveGestureDetector.java
@@ -1,9 +1,9 @@
 package com.mapbox.android.gestures;
 
 import android.content.Context;
-import android.support.annotation.DimenRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.UiThread;
+import androidx.annotation.DimenRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.UiThread;
 
 import java.util.HashSet;
 import java.util.Set;
diff --git a/library/src/main/java/com/mapbox/android/gestures/SidewaysShoveGestureDetector.java b/library/src/main/java/com/mapbox/android/gestures/SidewaysShoveGestureDetector.java
@@ -1,9 +1,9 @@
 package com.mapbox.android.gestures;
 
 import android.content.Context;
-import android.support.annotation.DimenRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.UiThread;
+import androidx.annotation.DimenRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.UiThread;
 
 import java.util.HashSet;
 import java.util.Set;
diff --git a/library/src/main/java/com/mapbox/android/gestures/StandardGestureDetector.java b/library/src/main/java/com/mapbox/android/gestures/StandardGestureDetector.java
@@ -1,8 +1,8 @@
 package com.mapbox.android.gestures;
 
 import android.content.Context;
-import android.support.annotation.UiThread;
-import android.support.v4.view.GestureDetectorCompat;
+import androidx.annotation.UiThread;
+import androidx.core.view.GestureDetectorCompat;
 import android.view.GestureDetector;
 import android.view.MotionEvent;
 
diff --git a/library/src/main/java/com/mapbox/android/gestures/StandardScaleGestureDetector.java b/library/src/main/java/com/mapbox/android/gestures/StandardScaleGestureDetector.java
@@ -2,10 +2,10 @@
 
 import android.content.Context;
 import android.graphics.PointF;
-import android.support.annotation.DimenRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.UiThread;
-import android.support.v4.view.GestureDetectorCompat;
+import androidx.annotation.DimenRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.UiThread;
+import androidx.core.view.GestureDetectorCompat;
 import android.view.GestureDetector;
 import android.view.MotionEvent;
 
diff --git a/library/src/main/java/com/mapbox/android/gestures/Utils.java b/library/src/main/java/com/mapbox/android/gestures/Utils.java
@@ -3,7 +3,7 @@
 import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.PointF;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.util.DisplayMetrics;
 import android.util.TypedValue;
 import android.view.MotionEvent;

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ android {`
`11`	`11`	`targetSdkVersion androidVersions.targetSdkVersion`
`12`	`12`	`versionCode 1`
`13`	`13`	`versionName "0.1.0"`
`14`		`- testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"`
	`14`	`+ testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`compileOptions {`