[ios] Load categories in MGLAccountManager for Fabric

These categories need to be loaded explicitly so that they’re linked into the application binary. In the dynamic framework, they’re loaded inside the InitializeMapbox() framework initializer; for static frameworks, we recommend setting the -ObjC flag. Fabric uses the static framework without setting the -ObjC flag, so these redundant calls are needed.

2 files changed, 15 insertions, 1 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d31b6f9038..b02f7323c6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -49,9 +49,13 @@ Known issues:
 - Black Screen On Ice Cream Sandwich and Jelly Bean devices ([#2802](https://github.com/mapbox/mapbox-gl-native/issues/2802))
   - Resolved in 2.2.0
 
+## iOS 3.1.1
+
+- Fixed Fabric compatibility. ([#3847](https://github.com/mapbox/mapbox-gl-native/pull/3847))
+
 ## iOS 3.1.0
 
-- The SDK is now distributed as a dynamic framework instead of a static library, resulting in a simpler installation workflow and significantly reduced download size. The framework contains both simulator and device content; due to [an Xcode bug](http://www.openradar.me/radar?id=6409498411401216), you’ll need to strip out the simulator content before submitting your application to the App Store. ([#3183](https://github.com/mapbox/mapbox-gl-native/pull/3183))
+- The SDK is now distributed as a dynamic framework instead of a static library, resulting in a simpler installation workflow and significantly reduced download size. The framework contains both simulator and device content. If you install the dynamic framework manually, you’ll need to strip out the simulator content before submitting your application to the App Store due to [an Xcode bug](http://www.openradar.me/radar?id=6409498411401216); see the installation instructions included with the framework for details. ([#3183](https://github.com/mapbox/mapbox-gl-native/pull/3183))
 - Fixed an issue causing the entire MGLMapView to leak. ([#3447](https://github.com/mapbox/mapbox-gl-native/pull/3447))
 - `MGLMapView` methods that alter the viewport now accept optional completion handlers. ([#3090](https://github.com/mapbox/mapbox-gl-native/pull/3090))
 - You can now modify an annotation’s image after adding the annotation to the map. ([#3146](https://github.com/mapbox/mapbox-gl-native/pull/3146))
diff --git a/platform/ios/src/MGLAccountManager.m b/platform/ios/src/MGLAccountManager.m
index 764f9f097b..6b98d5286a 100644
--- a/platform/ios/src/MGLAccountManager.m
+++ b/platform/ios/src/MGLAccountManager.m
@@ -1,7 +1,9 @@
 #import "MGLAccountManager_Private.h"
 #import "MGLMapboxEvents.h"
+#import "MGLMapView.h"
 #import "NSBundle+MGLAdditions.h"
 #import "NSProcessInfo+MGLAdditions.h"
+#import "NSString+MGLAdditions.h"
 
 #import "FABKitProtocol.h"
 #import "Fabric+FABKits.h"
@@ -93,6 +95,14 @@
     } else {
         NSLog(@"MGLAccountManager is used in a project that doesn't have Fabric.");
     }
+    
+    // https://github.com/mapbox/mapbox-gl-native/issues/2966
+    mgl_linkBundleCategory();
+    mgl_linkStringCategory();
+    mgl_linkProcessInfoCategory();
+    
+    // https://github.com/mapbox/mapbox-gl-native/issues/3113
+    [MGLMapView class];
 }
 
 @end