From d6ef473cc287ace311be610293e0adf5b964ca52 Mon Sep 17 00:00:00 2001
From: Kevin Hester <kevinh@geeksville.com>
Date: Fri, 11 Dec 2020 19:59:17 +0800
Subject: [PATCH] 1.1.21 hmm it seems that mapbox changed how they distribute
 their jars in March so we haven't been getting new versions of their code
 since then. Change to use their new (ugly) signin based system.  I bet this
 breaks CI but for now I just want to make sure I have fixes they mention in
 their github issues.

Upgrade from 9.2.1 to 9.5.0

In particular issues with Samsung devices - possibly related to
https://github.com/meshtastic/Meshtastic-Android/issues/206
---
 .idea/jarRepositories.xml |  5 +++++
 app/build.gradle          |  6 +++---
 build.gradle              | 14 ++++++++++++++
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index 237047402..d151f585d 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -26,5 +26,10 @@
       <option name="name" value="maven" />
       <option name="url" value="https://jitpack.io" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven" />
+      <option name="name" value="maven" />
+      <option name="url" value="https://api.mapbox.com/downloads/v2/releases/maven" />
+    </remote-repository>
   </component>
 </project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index dfe11bfc4..b14092b21 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -30,8 +30,8 @@ android {
         applicationId "com.geeksville.mesh"
         minSdkVersion 21 // The oldest emulator image I have tried is 22 (though 21 probably works)
         targetSdkVersion 29
-        versionCode 20120 // format is Mmmss (where M is 1+the numeric major number
-        versionName "1.1.20"
+        versionCode 20121 // format is Mmmss (where M is 1+the numeric major number
+        versionName "1.1.21"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
@@ -152,7 +152,7 @@ dependencies {
     implementation 'com.github.mik3y:usb-serial-for-android:v3.0.0'
 
     // mapbox
-    implementation 'com.mapbox.mapboxsdk:mapbox-android-sdk:9.2.1'
+    implementation 'com.mapbox.mapboxsdk:mapbox-android-sdk:9.5.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/build.gradle b/build.gradle
index f37671e92..4a2c8ff60 100644
--- a/build.gradle
+++ b/build.gradle
@@ -33,6 +33,20 @@ buildscript {
 
 allprojects {
     repositories {
+        maven {
+            // Per https://docs.mapbox.com/android/maps/guides/install/ we now need to signin to download mapbox lib
+            url 'https://api.mapbox.com/downloads/v2/releases/maven'
+            authentication {
+                basic(BasicAuthentication)
+            }
+            credentials {
+                // Do not change the username below.
+                // This should always be `mapbox` (not your username).
+                username = 'mapbox'
+                // Use the secret token you stored in gradle.properties as the password
+                password = project.properties['MAPBOX_DOWNLOADS_TOKEN'] ?: ""
+            }
+        }
         google()
         jcenter()
         maven { url 'https://jitpack.io' }