Increase minSDK to 19 and remove obsolete androidX Core dependency (#105

)
mapbox · Nov 24, 2023 · ace04ef · ace04ef
1 parent 18846f3
commit ace04ef
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog for the Mapbox Gestures for Android
 
+## 0.9.0 - November 24, 2023
+#### Breaking changes
+ - Increase minimum supported Android SDK version to 19 (KITKAT)
+#### Minor features
+ - Support compile SDK 30
+
 ## 0.8.0 - August 19, 2022
 #### Minor features
  - Updated dependencies : Maps 10.7.0, targetSdk 31, compileSdk 30. [#101](https://github.com/mapbox/mapbox-gestures-android/pull/101)

diff --git a/app/build.gradle b/app/build.gradle
@@ -44,6 +44,17 @@ dependencies {
     implementation(dependenciesList.mapboxMaps) {
         exclude group: 'com.mapbox.mapboxsdk', module: 'mapbox-android-gestures'
     }
+    implementation("androidx.core:core-ktx") {
+        version {
+            strictly("1.6.0")
+        }
+    }
+    implementation("androidx.core:core") {
+        version {
+            strictly("1.6.0")
+        }
+    }
+
 
     testImplementation dependenciesList.junit
     testImplementation dependenciesList.mockito

diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
@@ -1,12 +1,12 @@
 ext {
     androidVersions = [
-            minSdkVersion    : 14,
+            minSdkVersion    : 19,
             targetSdkVersion : 30,
             compileSdkVersion: 31,
     ]
 
     version = [
-            mapboxMaps       : '10.7.0',
+            mapboxMaps       : '10.16.2',
             timber           : '4.7.1',
             junit            : '4.13.2',
             mockito          : '3.2.4',
@@ -15,7 +15,6 @@ ext {
             espresso         : '3.4.0',
             kotlin           : '1.5.31',
             appCompat        : '1.3.0',
-            core             : '1.7.0', // last version compatible with kotlin 1.5.31
             annotation       : '1.1.0',
     ]
 
@@ -33,7 +32,6 @@ ext {
 
             // support
             supportAppcompatV7 : "androidx.appcompat:appcompat:${version.appCompat}",
-            supportCompat      : "androidx.core:core:${version.core}",
             annotations        : "androidx.annotation:annotation:${version.annotation}",
 
             // timber

diff --git a/library/build.gradle b/library/build.gradle
@@ -35,7 +35,6 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation dependenciesList.supportCompat
     implementation dependenciesList.annotations
     testImplementation dependenciesList.kotlinLib
     testImplementation dependenciesList.junit

diff --git a/library/gradle.properties b/library/gradle.properties
@@ -1,2 +1,2 @@
-VERSION_NAME=0.9.0-SNAPSHOT
+VERSION_NAME=0.10.0-SNAPSHOT
 POM_NAME=Mapbox Android Gestures Library
diff --git a/library/src/main/java/com/mapbox/android/gestures/StandardGestureDetector.java b/library/src/main/java/com/mapbox/android/gestures/StandardGestureDetector.java
@@ -4,7 +4,7 @@
 
 import androidx.annotation.UiThread;
 import androidx.annotation.NonNull;
-import androidx.core.view.GestureDetectorCompat;
+
 import android.view.GestureDetector;
 import android.view.MotionEvent;
 
@@ -19,17 +19,17 @@
 import static com.mapbox.android.gestures.AndroidGesturesManager.GESTURE_TYPE_SINGLE_TAP_UP;
 
 /**
- * Detector that wraps {@link GestureDetectorCompat}.
+ * Detector that wraps {@link GestureDetector}.
  */
 @UiThread
 public class StandardGestureDetector extends BaseGesture<StandardGestureDetector.StandardOnGestureListener> {
 
-  private final GestureDetectorCompat gestureDetector;
+  private final GestureDetector gestureDetector;
 
   public StandardGestureDetector(Context context, AndroidGesturesManager androidGesturesManager) {
     super(context, androidGesturesManager);
 
-    this.gestureDetector = new GestureDetectorCompat(context, innerListener);
+    this.gestureDetector = new GestureDetector(context, innerListener);
   }
 
   final StandardOnGestureListener innerListener = new StandardOnGestureListener() {
@@ -149,15 +149,15 @@ protected boolean analyzeEvent(@NonNull MotionEvent motionEvent) {
 
   /**
    * @return True if longpress in enabled, false otherwise.
-   * @see GestureDetectorCompat#isLongpressEnabled()
+   * @see GestureDetector#isLongpressEnabled()
    */
   public boolean isLongpressEnabled() {
     return gestureDetector.isLongpressEnabled();
   }
 
   /**
    * @param enabled True if longpress should be enabled, false otherwise.
-   * @see GestureDetectorCompat#setIsLongpressEnabled(boolean)
+   * @see GestureDetector#setIsLongpressEnabled(boolean)
    */
   public void setIsLongpressEnabled(boolean enabled) {
     gestureDetector.setIsLongpressEnabled(enabled);

diff --git a/library/src/main/java/com/mapbox/android/gestures/StandardScaleGestureDetector.java b/library/src/main/java/com/mapbox/android/gestures/StandardScaleGestureDetector.java
@@ -5,7 +5,6 @@
 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;
 
@@ -30,7 +29,7 @@ public class StandardScaleGestureDetector extends
 
   private static final float QUICK_SCALE_MULTIPLIER = 0.5f;
 
-  private final GestureDetectorCompat innerGestureDetector;
+  private final GestureDetector innerGestureDetector;
 
   private boolean quickScale;
   private PointF quickScaleFocalPoint;
@@ -61,7 +60,7 @@ public boolean onDoubleTapEvent(MotionEvent event) {
         return true;
       }
     };
-    innerGestureDetector = new GestureDetectorCompat(context, doubleTapEventListener);
+    innerGestureDetector = new GestureDetector(context, doubleTapEventListener);
   }
 
   @Override