From 6d100397eacd63b0025e876d06e01d00b9cce0e5 Mon Sep 17 00:00:00 2001
From: Petr Pokorny <petr-pokorny@hotmail.com>
Date: Thu, 6 May 2021 11:32:16 +0200
Subject: [PATCH] Migration to maplibre-java library

---
 .gitmodules                                    |  6 +++---
 platform/android/gradle/android-nitpick.gradle |  2 +-
 platform/android/gradle/dependencies.gradle    | 10 +++++-----
 platform/android/vendor/mapbox-java            |  1 -
 4 files changed, 9 insertions(+), 10 deletions(-)
 delete mode 160000 platform/android/vendor/mapbox-java

diff --git a/.gitmodules b/.gitmodules
index 8222d8416..41c816ff8 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -40,9 +40,9 @@
 [submodule "vendor/mapbox-gl-native-curl"]
 	path = vendor/mapbox-gl-native-curl
 	url = https://github.com/mapbox/mapbox-gl-native-curl.git
-[submodule "platform/android/vendor/mapbox-java"]
-	path = platform/android/vendor/mapbox-java
-	url = https://github.com/mapbox/mapbox-java.git
+[submodule "platform/android/vendor/maplibre-java"]
+	path = platform/android/vendor/maplibre-java
+	url = https://github.com/maplibre/maplibre-java.git
 [submodule "platform/android/vendor/mapbox-gestures-android"]
 	path = platform/android/vendor/mapbox-gestures-android
 	url = https://github.com/mapbox/mapbox-gestures-android.git
diff --git a/platform/android/gradle/android-nitpick.gradle b/platform/android/gradle/android-nitpick.gradle
index aabeec19e..e9b23537b 100644
--- a/platform/android/gradle/android-nitpick.gradle
+++ b/platform/android/gradle/android-nitpick.gradle
@@ -1,6 +1,6 @@
 apply from: "${rootDir}/gradle/dependencies.gradle"
 
-def MAPBOX_JAVA_DIR = 'mapbox-java'
+def MAPBOX_JAVA_DIR = 'maplibre-java'
 def MAPBOX_JAVA_TAG_PREFIX = 'v'
 
 def MAPBOX_CORE_TAG_PREFIX = '-core-'
diff --git a/platform/android/gradle/dependencies.gradle b/platform/android/gradle/dependencies.gradle
index acb0eaf1f..3c1cd1ab8 100644
--- a/platform/android/gradle/dependencies.gradle
+++ b/platform/android/gradle/dependencies.gradle
@@ -7,7 +7,7 @@ ext {
     ]
 
     versions = [
-            mapboxServices   : '5.3.0',
+            mapLibreServices : '5.9.0',
             mapboxCore       : '2.0.1',
             mapboxGestures   : '0.7.0',
             mapboxAccounts   : '0.7.0',
@@ -41,10 +41,10 @@ ext {
     ]
 
     dependenciesList = [
-            mapboxJavaGeoJSON      : "com.mapbox.mapboxsdk:mapbox-sdk-geojson:${versions.mapboxServices}",
-            mapboxAndroidGestures  : "com.mapbox.mapboxsdk:mapbox-android-gestures:${versions.mapboxGestures}",
-            mapboxAndroidAccounts  : "com.mapbox.mapboxsdk:mapbox-android-accounts:${versions.mapboxAccounts}",
-            mapboxJavaTurf         : "com.mapbox.mapboxsdk:mapbox-sdk-turf:${versions.mapboxServices}",
+            mapboxJavaGeoJSON      : "org.maplibre.gl:android-sdk-geojson:${versions.mapLibreServices}",
+            mapboxAndroidGestures  : "org.maplibre.gl:mapbox-android-gestures:${versions.mapboxGestures}",
+            mapboxAndroidAccounts  : "org.maplibre.gl:mapbox-android-accounts:${versions.mapboxAccounts}",
+            mapboxJavaTurf         : "org.maplibre.gl:android-sdk-turf:${versions.mapboxServices}",
 
             junit                  : "junit:junit:${versions.junit}",
             mockito                : "org.mockito:mockito-core:${versions.mockito}",
diff --git a/platform/android/vendor/mapbox-java b/platform/android/vendor/mapbox-java
deleted file mode 160000
index 71f3a6a75..000000000
--- a/platform/android/vendor/mapbox-java
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 71f3a6a75d8d2afa606fb8118f6bbbc7151215b3