diff --git a/gyp/platform-ios.gypi b/gyp/platform-ios.gypi index d5fb6a847..205cfe22d 100644 --- a/gyp/platform-ios.gypi +++ b/gyp/platform-ios.gypi @@ -65,6 +65,10 @@ '../platform/ios/NSString+MGLAdditions.m', '../platform/ios/vendor/SMCalloutView/SMCalloutView.h', '../platform/ios/vendor/SMCalloutView/SMCalloutView.m', + '../platform/ios/vendor/Fabric/FABAttributes.h', + '../platform/ios/vendor/Fabric/FABKitProtocol.h', + '../platform/ios/vendor/Fabric/Fabric.h', + '../platform/ios/vendor/Fabric/Fabric+FABKits.h', '../platform/ios/resources/', ], @@ -95,7 +99,6 @@ 'OTHER_CPLUSPLUSFLAGS': [ '<@(cflags_cc)' ], 'CLANG_ENABLE_OBJC_ARC': 'YES', 'CLANG_ENABLE_MODULES': 'YES', - 'FRAMEWORK_SEARCH_PATHS': '../platform/ios/vendor', }, 'link_settings': { diff --git a/platform/ios/MGLAccountManager.m b/platform/ios/MGLAccountManager.m index 36b35fa86..8f1393250 100644 --- a/platform/ios/MGLAccountManager.m +++ b/platform/ios/MGLAccountManager.m @@ -3,8 +3,8 @@ #import "MGLCategoryLoader.h" #import "NSProcessInfo+MGLAdditions.h" -#import -#import +#import "FABKitProtocol.h" +#import "Fabric+FABKits.h" @interface MGLAccountManager() diff --git a/platform/ios/vendor/Fabric b/platform/ios/vendor/Fabric deleted file mode 120000 index e10e5326d..000000000 --- a/platform/ios/vendor/Fabric +++ /dev/null @@ -1 +0,0 @@ -Fabric.framework/Headers \ No newline at end of file diff --git a/platform/ios/vendor/Fabric.framework/Info.plist b/platform/ios/vendor/Fabric.framework/Info.plist deleted file mode 100644 index d97b8e462..000000000 --- a/platform/ios/vendor/Fabric.framework/Info.plist +++ /dev/null @@ -1,55 +0,0 @@ - - - - - BuildMachineOSBuild - 14E46 - CFBundleDevelopmentRegion - en - CFBundleExecutable - Fabric - CFBundleIdentifier - io.fabric.sdk.ios - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - Fabric - CFBundlePackageType - FMWK - CFBundleShortVersionString - 1.4.0 - CFBundleSignature - ???? - CFBundleSupportedPlatforms - - iPhoneOS - - CFBundleVersion - 19 - DTCompiler - com.apple.compilers.llvm.clang.1_0 - DTPlatformBuild - 12F69 - DTPlatformName - iphoneos - DTPlatformVersion - 8.3 - DTSDKBuild - 12F69 - DTSDKName - iphoneos8.3 - DTXcode - 0631 - DTXcodeBuild - 6D1002 - MinimumOSVersion - 5.0 - NSHumanReadableCopyright - Copyright © 2015 Twitter. All rights reserved. - UIDeviceFamily - - 1 - 2 - - - diff --git a/platform/ios/vendor/Fabric.framework/Modules/module.modulemap b/platform/ios/vendor/Fabric.framework/Modules/module.modulemap deleted file mode 100644 index e714da08b..000000000 --- a/platform/ios/vendor/Fabric.framework/Modules/module.modulemap +++ /dev/null @@ -1,8 +0,0 @@ -framework module Fabric { - umbrella header "Fabric.h" - header "FABKitProtocol.h" - header "Fabric+FABKits.h" - - export * - module * { export * } -} \ No newline at end of file diff --git a/platform/ios/vendor/Fabric.framework/Headers/FABAttributes.h b/platform/ios/vendor/Fabric/FABAttributes.h similarity index 100% rename from platform/ios/vendor/Fabric.framework/Headers/FABAttributes.h rename to platform/ios/vendor/Fabric/FABAttributes.h diff --git a/platform/ios/vendor/Fabric.framework/Headers/FABKitProtocol.h b/platform/ios/vendor/Fabric/FABKitProtocol.h similarity index 100% rename from platform/ios/vendor/Fabric.framework/Headers/FABKitProtocol.h rename to platform/ios/vendor/Fabric/FABKitProtocol.h diff --git a/platform/ios/vendor/Fabric.framework/Headers/Fabric+FABKits.h b/platform/ios/vendor/Fabric/Fabric+FABKits.h similarity index 96% rename from platform/ios/vendor/Fabric.framework/Headers/Fabric+FABKits.h rename to platform/ios/vendor/Fabric/Fabric+FABKits.h index a7c297517..05e963021 100644 --- a/platform/ios/vendor/Fabric.framework/Headers/Fabric+FABKits.h +++ b/platform/ios/vendor/Fabric/Fabric+FABKits.h @@ -4,7 +4,7 @@ // Copyright (c) 2015 Twitter. All rights reserved. // -#import +#import "Fabric.h" @protocol FABKit; // Use this category for methods that kits can call on Fabric. diff --git a/platform/ios/vendor/Fabric.framework/Headers/Fabric.h b/platform/ios/vendor/Fabric/Fabric.h similarity index 100% rename from platform/ios/vendor/Fabric.framework/Headers/Fabric.h rename to platform/ios/vendor/Fabric/Fabric.h