From f4bfcb85f7badca1ef4c6c7fbe254ba7f6e929e3 Mon Sep 17 00:00:00 2001 From: Jackson Rosenthal Date: Sat, 5 Feb 2022 22:28:14 -0500 Subject: [PATCH] Removed old dependency of MapBox V9.x.x --- app/build.gradle | 5 +---- .../main/java/com/geeksville/mesh/MeshUtilApplication.kt | 6 ++---- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 813d00ff2..05c86b0a7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -165,10 +165,7 @@ dependencies { implementation 'com.github.mik3y:usb-serial-for-android:3.4.3' // mapbox - implementation 'com.mapbox.mapboxsdk:mapbox-android-sdk:9.7.1' - implementation('com.mapbox.maps:android:10.2.0') { - exclude group: 'com.mapbox.mapboxsdk', module: 'mapbox-android-telemetry' - } + implementation('com.mapbox.maps:android:10.2.0') // mapbox specifies a really old version of okhttp3 which causes lots of API warnings. trying a newer version implementation 'com.squareup.okhttp3:okhttp:4.9.0' diff --git a/app/src/main/java/com/geeksville/mesh/MeshUtilApplication.kt b/app/src/main/java/com/geeksville/mesh/MeshUtilApplication.kt index e0a9bd87b..bdbb89057 100644 --- a/app/src/main/java/com/geeksville/mesh/MeshUtilApplication.kt +++ b/app/src/main/java/com/geeksville/mesh/MeshUtilApplication.kt @@ -7,8 +7,8 @@ import com.geeksville.android.GeeksvilleApplication import com.geeksville.android.Logging import com.geeksville.util.Exceptions import com.google.firebase.crashlytics.FirebaseCrashlytics -import com.mapbox.mapboxsdk.Mapbox - +import com.mapbox.maps.loader.MapboxMaps +import com.mapbox.maps.plugin.Plugin class MeshUtilApplication : GeeksvilleApplication() { @@ -50,7 +50,5 @@ class MeshUtilApplication : GeeksvilleApplication() { sendCrashReports() // Send the new report } } - - Mapbox.getInstance(this, getString(R.string.mapbox_access_token)) } } \ No newline at end of file