From 4343ab936c833772f55873ac88b52ead45efe011 Mon Sep 17 00:00:00 2001 From: Jason Wray Date: Mon, 18 Jun 2018 19:03:59 -0700 Subject: [ios, build] Completely remove support for Fabric (#12106) --- platform/darwin/src/MGLAccountManager.m | 36 +------------------ platform/ios/CHANGELOG.md | 1 + platform/ios/ios.xcodeproj/project.pbxproj | 33 ------------------ platform/ios/vendor/Fabric/FABAttributes.h | 49 -------------------------- platform/ios/vendor/Fabric/FABKitProtocol.h | 46 ------------------------ platform/ios/vendor/Fabric/Fabric+FABKits.h | 25 ------------- platform/ios/vendor/Fabric/Fabric.h | 54 ----------------------------- 7 files changed, 2 insertions(+), 242 deletions(-) delete mode 100644 platform/ios/vendor/Fabric/FABAttributes.h delete mode 100644 platform/ios/vendor/Fabric/FABKitProtocol.h delete mode 100644 platform/ios/vendor/Fabric/Fabric+FABKits.h delete mode 100644 platform/ios/vendor/Fabric/Fabric.h diff --git a/platform/darwin/src/MGLAccountManager.m b/platform/darwin/src/MGLAccountManager.m index 13cbebf9fd..4a3f698427 100644 --- a/platform/darwin/src/MGLAccountManager.m +++ b/platform/darwin/src/MGLAccountManager.m @@ -5,10 +5,7 @@ #if TARGET_OS_IPHONE || TARGET_OS_SIMULATOR #import "MGLMapboxEvents.h" -#import "FABKitProtocol.h" -#import "Fabric+FABKits.h" - -@interface MGLAccountManager () +@interface MGLAccountManager () @property (atomic) NSString *accessToken; @@ -74,35 +71,4 @@ return [MGLAccountManager sharedManager].accessToken; } -#if TARGET_OS_IPHONE || TARGET_OS_SIMULATOR - -#pragma mark - Fabric - -+ (NSString *)bundleIdentifier { - return [NSBundle mgl_frameworkBundleIdentifier]; -} - -+ (NSString *)kitDisplayVersion { - return [NSBundle mgl_frameworkInfoDictionary][@"CFBundleShortVersionString"]; -} - -+ (void)initializeIfNeeded { - Class fabric = NSClassFromString(@"Fabric"); - - if (fabric) { - NSDictionary *configuration = [fabric configurationDictionaryForKitClass:[MGLAccountManager class]]; - if (!configuration || !configuration[@"accessToken"]) { - NSLog(@"Configuration dictionary returned by Fabric was nil or doesn’t have accessToken. Can’t initialize MGLAccountManager."); - return; - } - [self setAccessToken:configuration[@"accessToken"]]; - MGLAccountManager *sharedAccountManager = [self sharedManager]; - NSLog(@"MGLAccountManager was initialized with access token: %@", sharedAccountManager.accessToken); - } else { - NSLog(@"MGLAccountManager is used in a project that doesn’t have Fabric."); - } -} - -#endif - @end diff --git a/platform/ios/CHANGELOG.md b/platform/ios/CHANGELOG.md index b6adc0a704..2bd5ed7dee 100644 --- a/platform/ios/CHANGELOG.md +++ b/platform/ios/CHANGELOG.md @@ -7,6 +7,7 @@ Mapbox welcomes participation and contributions from everyone. Please read [CONT ### Packaging * The minimum deployment target for this SDK is now iOS 9.0. ([#11776](https://github.com/mapbox/mapbox-gl-native/pull/11776)) +* Removed support for the Fabric distribution platform. ([#12106](https://github.com/mapbox/mapbox-gl-native/pull/12106)) ### Style layers diff --git a/platform/ios/ios.xcodeproj/project.pbxproj b/platform/ios/ios.xcodeproj/project.pbxproj index 2515ece910..bc7aa64293 100644 --- a/platform/ios/ios.xcodeproj/project.pbxproj +++ b/platform/ios/ios.xcodeproj/project.pbxproj @@ -353,10 +353,6 @@ 96E516FB20005A4000A02306 /* MGLUserLocationHeadingBeamLayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 966FCF4A1F3A5C9200F2B6DE /* MGLUserLocationHeadingBeamLayer.h */; }; 96E516FC20005A4400A02306 /* MGLUserLocationHeadingIndicator.h in Headers */ = {isa = PBXBuildFile; fileRef = 96F3F73B1F5711F1003E2D2C /* MGLUserLocationHeadingIndicator.h */; }; 96E516FF20005A4F00A02306 /* MGLMapboxEvents.h in Headers */ = {isa = PBXBuildFile; fileRef = DA8848481CBAFB9800AB86E3 /* MGLMapboxEvents.h */; }; - 96E5170020005A6100A02306 /* Fabric.h in Headers */ = {isa = PBXBuildFile; fileRef = DA8848831CBB033F00AB86E3 /* Fabric.h */; }; - 96E5170120005A6400A02306 /* Fabric+FABKits.h in Headers */ = {isa = PBXBuildFile; fileRef = DA8848821CBB033F00AB86E3 /* Fabric+FABKits.h */; }; - 96E5170220005A6600A02306 /* FABAttributes.h in Headers */ = {isa = PBXBuildFile; fileRef = DA8848801CBB033F00AB86E3 /* FABAttributes.h */; }; - 96E5170320005A6800A02306 /* FABKitProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = DA8848811CBB033F00AB86E3 /* FABKitProtocol.h */; }; 96E5170420005A6B00A02306 /* SMCalloutView.h in Headers */ = {isa = PBXBuildFile; fileRef = DA8848891CBB037E00AB86E3 /* SMCalloutView.h */; }; 96F3F73C1F57124B003E2D2C /* MGLUserLocationHeadingIndicator.h in Headers */ = {isa = PBXBuildFile; fileRef = 96F3F73B1F5711F1003E2D2C /* MGLUserLocationHeadingIndicator.h */; }; AC518DFF201BB55A00EBC820 /* MGLTelemetryConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = AC518DFD201BB55A00EBC820 /* MGLTelemetryConfig.h */; }; @@ -503,10 +499,6 @@ DA88485C1CBAFB9800AB86E3 /* MGLFaux3DUserLocationAnnotationView.h in Headers */ = {isa = PBXBuildFile; fileRef = DA88484D1CBAFB9800AB86E3 /* MGLFaux3DUserLocationAnnotationView.h */; }; DA88485D1CBAFB9800AB86E3 /* MGLFaux3DUserLocationAnnotationView.m in Sources */ = {isa = PBXBuildFile; fileRef = DA88484E1CBAFB9800AB86E3 /* MGLFaux3DUserLocationAnnotationView.m */; }; DA8848601CBAFC2E00AB86E3 /* Mapbox.h in Headers */ = {isa = PBXBuildFile; fileRef = DA88485E1CBAFC2E00AB86E3 /* Mapbox.h */; settings = {ATTRIBUTES = (Public, ); }; }; - DA8848841CBB033F00AB86E3 /* FABAttributes.h in Headers */ = {isa = PBXBuildFile; fileRef = DA8848801CBB033F00AB86E3 /* FABAttributes.h */; }; - DA8848851CBB033F00AB86E3 /* FABKitProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = DA8848811CBB033F00AB86E3 /* FABKitProtocol.h */; }; - DA8848861CBB033F00AB86E3 /* Fabric+FABKits.h in Headers */ = {isa = PBXBuildFile; fileRef = DA8848821CBB033F00AB86E3 /* Fabric+FABKits.h */; }; - DA8848871CBB033F00AB86E3 /* Fabric.h in Headers */ = {isa = PBXBuildFile; fileRef = DA8848831CBB033F00AB86E3 /* Fabric.h */; }; DA88488B1CBB037E00AB86E3 /* SMCalloutView.h in Headers */ = {isa = PBXBuildFile; fileRef = DA8848891CBB037E00AB86E3 /* SMCalloutView.h */; }; DA88488C1CBB037E00AB86E3 /* SMCalloutView.m in Sources */ = {isa = PBXBuildFile; fileRef = DA88488A1CBB037E00AB86E3 /* SMCalloutView.m */; }; DA8933A31CCC95B000E68420 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = DA89339F1CCC951200E68420 /* Localizable.strings */; }; @@ -1177,10 +1169,6 @@ DA88484D1CBAFB9800AB86E3 /* MGLFaux3DUserLocationAnnotationView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGLFaux3DUserLocationAnnotationView.h; sourceTree = ""; }; DA88484E1CBAFB9800AB86E3 /* MGLFaux3DUserLocationAnnotationView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MGLFaux3DUserLocationAnnotationView.m; sourceTree = ""; }; DA88485E1CBAFC2E00AB86E3 /* Mapbox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Mapbox.h; path = src/Mapbox.h; sourceTree = SOURCE_ROOT; }; - DA8848801CBB033F00AB86E3 /* FABAttributes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FABAttributes.h; sourceTree = ""; }; - DA8848811CBB033F00AB86E3 /* FABKitProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FABKitProtocol.h; sourceTree = ""; }; - DA8848821CBB033F00AB86E3 /* Fabric+FABKits.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Fabric+FABKits.h"; sourceTree = ""; }; - DA8848831CBB033F00AB86E3 /* Fabric.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Fabric.h; sourceTree = ""; }; DA8848891CBB037E00AB86E3 /* SMCalloutView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SMCalloutView.h; sourceTree = ""; }; DA88488A1CBB037E00AB86E3 /* SMCalloutView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SMCalloutView.m; sourceTree = ""; }; DA8933A01CCC951200E68420 /* Base */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = Base; path = Base.lproj/Localizable.strings; sourceTree = ""; }; @@ -1932,7 +1920,6 @@ children = ( DAD165841CF4D06B001FF4B9 /* Annotations */, 35CE617F1D4165C2004F2359 /* Categories */, - DA88487F1CBB033F00AB86E3 /* Fabric */, DA8848881CBB036000AB86E3 /* SMCalloutView */, DAD165851CF4D08B001FF4B9 /* Telemetry */, 355ADFF91E9281C300F3939D /* Views */, @@ -1961,18 +1948,6 @@ path = resources; sourceTree = SOURCE_ROOT; }; - DA88487F1CBB033F00AB86E3 /* Fabric */ = { - isa = PBXGroup; - children = ( - DA8848831CBB033F00AB86E3 /* Fabric.h */, - DA8848821CBB033F00AB86E3 /* Fabric+FABKits.h */, - DA8848801CBB033F00AB86E3 /* FABAttributes.h */, - DA8848811CBB033F00AB86E3 /* FABKitProtocol.h */, - ); - name = Fabric; - path = ../vendor/Fabric; - sourceTree = ""; - }; DA8848881CBB036000AB86E3 /* SMCalloutView */ = { isa = PBXGroup; children = ( @@ -2210,7 +2185,6 @@ DAF2571B201901E200367EF5 /* MGLHillshadeStyleLayer.h in Headers */, DA35A2BB1CCA9A6900E826B2 /* MGLClockDirectionFormatter.h in Headers */, 353933FE1D3FB7DD003F57D7 /* MGLSymbolStyleLayer.h in Headers */, - DA8848861CBB033F00AB86E3 /* Fabric+FABKits.h in Headers */, DA8848201CBAFA6200AB86E3 /* MGLOfflinePack_Private.h in Headers */, DA00FC8E1D5EEB0D009AABC8 /* MGLAttributionInfo.h in Headers */, DA8847FA1CBAFA5100AB86E3 /* MGLPolyline.h in Headers */, @@ -2312,7 +2286,6 @@ 3538AA1D1D542239008EC33D /* MGLForegroundStyleLayer.h in Headers */, DA8847F51CBAFA5100AB86E3 /* MGLOfflineRegion.h in Headers */, DA737EE11D056A4E005BDA16 /* MGLMapViewDelegate.h in Headers */, - DA8848851CBB033F00AB86E3 /* FABKitProtocol.h in Headers */, ACF969F420CB04E600B23FB7 /* MMEEventsService.h in Headers */, AC518DFF201BB55A00EBC820 /* MGLTelemetryConfig.h in Headers */, DA88481B1CBAFA6200AB86E3 /* MGLGeometry_Private.h in Headers */, @@ -2322,11 +2295,9 @@ DA72620B1DEEE3480043BB89 /* MGLOpenGLStyleLayer.h in Headers */, 404C26E71D89C55D000AA13D /* MGLTileSource_Private.h in Headers */, DA88485C1CBAFB9800AB86E3 /* MGLFaux3DUserLocationAnnotationView.h in Headers */, - DA8848871CBB033F00AB86E3 /* Fabric.h in Headers */, 35305D4A1D22AA6A0007D005 /* NSData+MGLAdditions.h in Headers */, 359F57461D2FDDA6005217F1 /* MGLUserLocationAnnotationView_Private.h in Headers */, 404C26E21D89B877000AA13D /* MGLTileSource.h in Headers */, - DA8848841CBB033F00AB86E3 /* FABAttributes.h in Headers */, DA8847FD1CBAFA5100AB86E3 /* MGLTilePyramidOfflineRegion.h in Headers */, DA88482F1CBAFA6200AB86E3 /* NSProcessInfo+MGLAdditions.h in Headers */, DA8848601CBAFC2E00AB86E3 /* Mapbox.h in Headers */, @@ -2346,7 +2317,6 @@ 556660CA1E1BF3A900E2C41B /* MGLFoundation.h in Headers */, 96E516ED200058A200A02306 /* MGLComputedShapeSource.h in Headers */, 35B82BF91D6C5F8400B1B721 /* NSPredicate+MGLAdditions.h in Headers */, - 96E5170020005A6100A02306 /* Fabric.h in Headers */, DA35A2CA1CCAAAD200E826B2 /* NSValue+MGLAdditions.h in Headers */, 350098BC1D480108004B2AF0 /* MGLVectorTileSource.h in Headers */, FA68F14B1E9D656600F9F6C2 /* MGLFillExtrusionStyleLayer.h in Headers */, @@ -2379,7 +2349,6 @@ 353933FF1D3FB7DD003F57D7 /* MGLSymbolStyleLayer.h in Headers */, DAAF722E1DA903C700312FA4 /* MGLStyleValue_Private.h in Headers */, DABFB8661CBE99E500D62B32 /* MGLPointAnnotation.h in Headers */, - 96E5170220005A6600A02306 /* FABAttributes.h in Headers */, 96E516E42000560B00A02306 /* MGLComputedShapeSource_Private.h in Headers */, 96E516E92000560B00A02306 /* MGLAnnotationImage_Private.h in Headers */, 96E516E52000560B00A02306 /* MGLOfflinePack_Private.h in Headers */, @@ -2459,7 +2428,6 @@ DA35A2BC1CCA9A6900E826B2 /* MGLClockDirectionFormatter.h in Headers */, 96E516E82000560B00A02306 /* MGLAnnotationContainerView_Private.h in Headers */, 35D13AC41D3D19DD00AFB4E0 /* MGLFillStyleLayer.h in Headers */, - 96E5170120005A6400A02306 /* Fabric+FABKits.h in Headers */, DABFB86E1CBE9A0F00D62B32 /* MGLCalloutView.h in Headers */, 96E516FC20005A4400A02306 /* MGLUserLocationHeadingIndicator.h in Headers */, 1F7454971ECD450D00021D39 /* MGLLight_Private.h in Headers */, @@ -2468,7 +2436,6 @@ DAF0D8191DFE6B2800B28378 /* MGLAttributionInfo_Private.h in Headers */, DABFB86A1CBE99E500D62B32 /* MGLStyle.h in Headers */, DA00FC8F1D5EEB0D009AABC8 /* MGLAttributionInfo.h in Headers */, - 96E5170320005A6800A02306 /* FABKitProtocol.h in Headers */, 96E516E12000551100A02306 /* MGLMultiPoint_Private.h in Headers */, 3EA934623AD0000B7D99C3FB /* MGLRendererConfiguration.h in Headers */, DACA86272019218600E9693A /* MGLRasterDEMSource.h in Headers */, diff --git a/platform/ios/vendor/Fabric/FABAttributes.h b/platform/ios/vendor/Fabric/FABAttributes.h deleted file mode 100644 index c3c6238503..0000000000 --- a/platform/ios/vendor/Fabric/FABAttributes.h +++ /dev/null @@ -1,49 +0,0 @@ -// -// FABAttributes.h -// Fabric -// -// Created by Priyanka Joshi on 3/3/15. -// Copyright (c) 2015 Twitter. All rights reserved. -// - -#pragma once - -#define FAB_UNAVAILABLE(x) __attribute__((unavailable(x))) - -#if __has_feature(nullability) - #define fab_nullable nullable - #define fab_nonnull nonnull - #define fab_null_unspecified null_unspecified - #define fab_null_resettable null_resettable - #define __fab_nullable __nullable - #define __fab_nonnull __nonnull - #define __fab_null_unspecified __null_unspecified -#else - #define fab_nullable - #define fab_nonnull - #define fab_null_unspecified - #define fab_null_resettable - #define __fab_nullable - #define __fab_nonnull - #define __fab_null_unspecified -#endif - -#ifndef NS_ASSUME_NONNULL_BEGIN - #define NS_ASSUME_NONNULL_BEGIN -#endif - -#ifndef NS_ASSUME_NONNULL_END - #define NS_ASSUME_NONNULL_END -#endif - - -/** - * The following macros are defined here to provide - * backwards compatability. If you are still using - * them you should migrate to the new versions that - * are defined above. - */ -#define FAB_NONNULL __fab_nonnull -#define FAB_NULLABLE __fab_nullable -#define FAB_START_NONNULL NS_ASSUME_NONNULL_BEGIN -#define FAB_END_NONNULL NS_ASSUME_NONNULL_END diff --git a/platform/ios/vendor/Fabric/FABKitProtocol.h b/platform/ios/vendor/Fabric/FABKitProtocol.h deleted file mode 100644 index 53e0656de0..0000000000 --- a/platform/ios/vendor/Fabric/FABKitProtocol.h +++ /dev/null @@ -1,46 +0,0 @@ -// -// FABKitProtocol.h -// -// Copyright (c) 2015 Twitter. All rights reserved. -// - -#import - -/** - * Protocol that a class in a Fabric Kit must conform to to provide information to Fabric at runtime. - */ -@protocol FABKit - -@required - -/** - * Required. The globally unique identifier of the Kit. - * We encourage the use of reverse-DNS notation. - * Example: @"io.fabric.sdk.ios" - */ -+ (NSString *)bundleIdentifier; - -/** - * Required. Must return the current version of the Kit that is being used at runtime. - * We encourage the use of semantic versioning (http://semver.org/), without prefixing the version with a "v". - * This is commonly referred to as the "marketing version". - * Example: @"1.2.3" - */ -+ (NSString *)kitDisplayVersion; - -@optional - -/** - * The build version of the kit. Should be monotonically increasing and unique. - * Example: 137 - */ -+ (NSString *)kitBuildVersion; - -/** - * Perform any necessary initialization. - * This method will be invoked on the Kit when the user calls +[Fabric initializeKits]. - * @note This method being called does not necessarily imply that the developer has started using the Kit yet. - */ -+ (void)initializeIfNeeded; - -@end diff --git a/platform/ios/vendor/Fabric/Fabric+FABKits.h b/platform/ios/vendor/Fabric/Fabric+FABKits.h deleted file mode 100644 index bb576ab061..0000000000 --- a/platform/ios/vendor/Fabric/Fabric+FABKits.h +++ /dev/null @@ -1,25 +0,0 @@ -// -// Fabric+FABKits.h -// -// Copyright (c) 2015 Twitter. All rights reserved. -// - -#import "Fabric.h" - -@protocol FABKit; -// Use this category for methods that kits can call on Fabric. -@interface Fabric (FABKits) - -/** - * Returns a dictionary containing the kit configuration info for the provided kit. - * The configuration information is parsed from the application's Info.plist. This - * method is primarily intended to be used by kits to retrieve their configuration. - * - * @param kitClass The class of the kit whose configuration should be returned. - * It should conform to the FABKit protocol. - * - * @return A dictionary containing kit specific configuration information or nil if none exists. - */ -+ (fab_nonnull NSDictionary *)configurationDictionaryForKitClass:(fab_nonnull Class)kitClass; - -@end diff --git a/platform/ios/vendor/Fabric/Fabric.h b/platform/ios/vendor/Fabric/Fabric.h deleted file mode 100644 index f0ca18fb16..0000000000 --- a/platform/ios/vendor/Fabric/Fabric.h +++ /dev/null @@ -1,54 +0,0 @@ -// -// Fabric.h -// -// Copyright (c) 2015 Twitter. All rights reserved. -// - -#import -#import "FABAttributes.h" - -NS_ASSUME_NONNULL_BEGIN - -/** - * Fabric Base. Coordinates configuration and starts all provided kits. - */ -@interface Fabric : NSObject - -/** - * Initialize Fabric and all provided kits. Call this method within your App Delegate's `application:didFinishLaunchingWithOptions:` and provide the kits you wish to use. - * - * For example, in Objective-C: - * - * `[Fabric with:@[[Crashlytics class], [Twitter class], [Digits class], [MoPub class]]];` - * - * Swift: - * - * `Fabric.with([Crashlytics.self(), Twitter.self(), Digits.self(), MoPub.self()])` - * - * Only the first call to this method is honored. Subsequent calls are no-ops. - * - * @param kitClasses An array of kit Class objects - * - * @return Returns the shared Fabric instance. In most cases this can be ignored. - */ -+ (instancetype)with:(NSArray *)kitClasses; - -/** - * Returns the Fabric singleton object. - */ -+ (instancetype)sharedSDK; - -/** - * This BOOL enables or disables debug logging, such as kit version information. The default value is NO. - */ -@property (nonatomic, assign) BOOL debug; - -/** - * Unavailable. Use `+sharedSDK` to retrieve the shared Fabric instance. - */ -- (id)init FAB_UNAVAILABLE("Use +sharedSDK to retrieve the shared Fabric instance."); - -@end - -NS_ASSUME_NONNULL_END - -- cgit v1.2.1