Merge branch 'fix-ios-crash-screen' of github.com:ytgov/sights-and-si…

…tes-app into fix-ios-crash-screen
ytgov · Apr 8, 2024 · b0f58f1 · b0f58f1
2 parents bdae6ea + 5dc3342
commit b0f58f1
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -133,6 +133,13 @@ android {
 
  compileSdkVersion rootProject.ext.compileSdkVersion
 
+ packagingOptions {
+ pickFirst 'lib/x86/libc++_shared.so'
+ pickFirst 'lib/x86_64/libc++_shared.so'
+ pickFirst 'lib/armeabi-v7a/libc++_shared.so'
+ pickFirst 'lib/arm64-v8a/libc++_shared.so'
+ }
+
  defaultConfig {
  applicationId "com.yukon"
  minSdkVersion rootProject.ext.minSdkVersion

diff --git a/android/build.gradle b/android/build.gradle
@@ -32,6 +32,19 @@ buildscript {
 
 allprojects {
  repositories {
+ maven {
+ 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'] ?: ""
+ }
+ }
  maven {
  // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
  url("$rootDir/../node_modules/react-native/android")