From eff76f8d71eea615097c15a4060bbca523520ce1 Mon Sep 17 00:00:00 2001
From: Artak Kalantarian <artak@burlymarmot.com>
Date: Fri, 23 Dec 2022 03:29:00 +0400
Subject: [PATCH] =?UTF-8?q?Bump=20minSDK=20to=2021=20and=20remove=20mistak?=
 =?UTF-8?q?enly=20submitted=20files=20adding=20them=20t=E2=80=A6=20(#630)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Artak Kalantarian <artak@amazon.com>
---
 benchmark/android/app/build.gradle                       | 2 +-
 platform/android/CHANGELOG.md                            | 3 ++-
 platform/android/MapboxGLAndroidSDK/.gitignore           | 2 ++
 platform/android/MapboxGLAndroidSDK/local.properties     | 8 --------
 platform/android/MapboxGLAndroidSDKLint/.gitignore       | 2 ++
 platform/android/MapboxGLAndroidSDKLint/local.properties | 8 --------
 platform/android/MapboxGLAndroidSDKTestApp/.gitignore    | 4 +++-
 platform/android/gradle/dependencies.gradle              | 2 +-
 render-test/android/app/build.gradle                     | 2 +-
 9 files changed, 12 insertions(+), 21 deletions(-)
 delete mode 100644 platform/android/MapboxGLAndroidSDK/local.properties
 delete mode 100644 platform/android/MapboxGLAndroidSDKLint/local.properties

diff --git a/benchmark/android/app/build.gradle b/benchmark/android/app/build.gradle
index f239f2eab..7d5286d50 100644
--- a/benchmark/android/app/build.gradle
+++ b/benchmark/android/app/build.gradle
@@ -5,7 +5,7 @@ android {
 
     defaultConfig {
         applicationId = 'com.mapbox.mapboxsdk.maps.benchmark_runner'
-        minSdkVersion 14
+        minSdkVersion 21
         targetSdkVersion 33
         def abi = 'all'
         if (project.hasProperty('mapbox.abis')) {
diff --git a/platform/android/CHANGELOG.md b/platform/android/CHANGELOG.md
index f8b7f84a2..f6905cdc0 100644
--- a/platform/android/CHANGELOG.md
+++ b/platform/android/CHANGELOG.md
@@ -10,11 +10,12 @@ MapLibre welcomes participation and contributions from everyone. Please read [`C
 
 ### 🐞 Bug fixes
 
+* Increment minSdkVersion from 14 to 21, as it covers 99.2%% of the newer devices since 2014
+*    and lessens the backward compatibility burden ([630](https://github.com/maplibre/maplibre-gl-native/pull/630))
 * Catches NaN for onMove event ([621](https://github.com/maplibre/maplibre-gl-native/pull/621))
 
 ### ⛵ Dependencies
 
-* Add your pull request...
 * Revert "Revert "Gradle update"" - Update Gradle from v3 to v7 ([#619](https://github.com/maplibre/maplibre-gl-native/pull/619))
 
 ## 9.6.0 - December 18, 2022
diff --git a/platform/android/MapboxGLAndroidSDK/.gitignore b/platform/android/MapboxGLAndroidSDK/.gitignore
index e44384742..892601389 100644
--- a/platform/android/MapboxGLAndroidSDK/.gitignore
+++ b/platform/android/MapboxGLAndroidSDK/.gitignore
@@ -1,2 +1,4 @@
 dependency-graph-mapbox-libraries.png
 src/test/resources/mobile-event*
+local.properties
+
diff --git a/platform/android/MapboxGLAndroidSDK/local.properties b/platform/android/MapboxGLAndroidSDK/local.properties
deleted file mode 100644
index 2d1644dc1..000000000
--- a/platform/android/MapboxGLAndroidSDK/local.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-## This file must *NOT* be checked into Version Control Systems,
-# as it contains information specific to your local configuration.
-#
-# Location of the SDK. This is only used by Gradle.
-# For customization when using a Version Control System, please read the
-# header note.
-#Tue Dec 20 16:17:15 PST 2022
-sdk.dir=/Users/artak/Library/Android/sdk
diff --git a/platform/android/MapboxGLAndroidSDKLint/.gitignore b/platform/android/MapboxGLAndroidSDKLint/.gitignore
index 796b96d1c..3cd0d692d 100644
--- a/platform/android/MapboxGLAndroidSDKLint/.gitignore
+++ b/platform/android/MapboxGLAndroidSDKLint/.gitignore
@@ -1 +1,3 @@
 /build
+local.properties
+
diff --git a/platform/android/MapboxGLAndroidSDKLint/local.properties b/platform/android/MapboxGLAndroidSDKLint/local.properties
deleted file mode 100644
index 1c9fd23bd..000000000
--- a/platform/android/MapboxGLAndroidSDKLint/local.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-## This file must *NOT* be checked into Version Control Systems,
-# as it contains information specific to your local configuration.
-#
-# Location of the SDK. This is only used by Gradle.
-# For customization when using a Version Control System, please read the
-# header note.
-#Tue Dec 20 16:17:45 PST 2022
-sdk.dir=/Users/artak/Library/Android/sdk
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/.gitignore b/platform/android/MapboxGLAndroidSDKTestApp/.gitignore
index cec211fe8..508b5df40 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/.gitignore
+++ b/platform/android/MapboxGLAndroidSDKTestApp/.gitignore
@@ -1,2 +1,4 @@
 lint-baseline.xml
-lint/lint-baseline-local.xml
\ No newline at end of file
+lint/lint-baseline-local.xml
+local.properties
+
diff --git a/platform/android/gradle/dependencies.gradle b/platform/android/gradle/dependencies.gradle
index f8d330e6e..e8a55cb41 100644
--- a/platform/android/gradle/dependencies.gradle
+++ b/platform/android/gradle/dependencies.gradle
@@ -1,7 +1,7 @@
 ext {
 
     androidVersions = [
-            minSdkVersion    : 14,
+            minSdkVersion    : 21,
             targetSdkVersion : 33,
             compileSdkVersion: 33,
     ]
diff --git a/render-test/android/app/build.gradle b/render-test/android/app/build.gradle
index d386903ac..dd7fe59ec 100644
--- a/render-test/android/app/build.gradle
+++ b/render-test/android/app/build.gradle
@@ -5,7 +5,7 @@ android {
 
     defaultConfig {
         applicationId = 'com.mapbox.mapboxsdk.maps.render_test_runner'
-        minSdkVersion 14
+        minSdkVersion 21
         targetSdkVersion 33
         def abi = 'all'
         if (project.hasProperty('mapbox.abis')) {