diff options
-rw-r--r-- | gyp/platform-ios.gypi | 5 | ||||
-rw-r--r-- | platform/ios/MGLAccountManager.m | 4 | ||||
l--------- | platform/ios/vendor/Fabric | 1 | ||||
-rw-r--r-- | platform/ios/vendor/Fabric.framework/Info.plist | 55 | ||||
-rw-r--r-- | platform/ios/vendor/Fabric.framework/Modules/module.modulemap | 8 | ||||
-rw-r--r-- | platform/ios/vendor/Fabric/FABAttributes.h (renamed from platform/ios/vendor/Fabric.framework/Headers/FABAttributes.h) | 0 | ||||
-rw-r--r-- | platform/ios/vendor/Fabric/FABKitProtocol.h (renamed from platform/ios/vendor/Fabric.framework/Headers/FABKitProtocol.h) | 0 | ||||
-rw-r--r-- | platform/ios/vendor/Fabric/Fabric+FABKits.h (renamed from platform/ios/vendor/Fabric.framework/Headers/Fabric+FABKits.h) | 2 | ||||
-rw-r--r-- | platform/ios/vendor/Fabric/Fabric.h (renamed from platform/ios/vendor/Fabric.framework/Headers/Fabric.h) | 0 |
9 files changed, 7 insertions, 68 deletions
diff --git a/gyp/platform-ios.gypi b/gyp/platform-ios.gypi index d5fb6a8474..205cfe22dd 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 36b35fa861..8f13932503 100644 --- a/platform/ios/MGLAccountManager.m +++ b/platform/ios/MGLAccountManager.m @@ -3,8 +3,8 @@ #import "MGLCategoryLoader.h" #import "NSProcessInfo+MGLAdditions.h" -#import <Fabric/FABKitProtocol.h> -#import <Fabric/Fabric+FABKits.h> +#import "FABKitProtocol.h" +#import "Fabric+FABKits.h" @interface MGLAccountManager() <FABKit> diff --git a/platform/ios/vendor/Fabric b/platform/ios/vendor/Fabric deleted file mode 120000 index e10e5326dd..0000000000 --- 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 d97b8e4622..0000000000 --- a/platform/ios/vendor/Fabric.framework/Info.plist +++ /dev/null @@ -1,55 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> -<plist version="1.0"> -<dict> - <key>BuildMachineOSBuild</key> - <string>14E46</string> - <key>CFBundleDevelopmentRegion</key> - <string>en</string> - <key>CFBundleExecutable</key> - <string>Fabric</string> - <key>CFBundleIdentifier</key> - <string>io.fabric.sdk.ios</string> - <key>CFBundleInfoDictionaryVersion</key> - <string>6.0</string> - <key>CFBundleName</key> - <string>Fabric</string> - <key>CFBundlePackageType</key> - <string>FMWK</string> - <key>CFBundleShortVersionString</key> - <string>1.4.0</string> - <key>CFBundleSignature</key> - <string>????</string> - <key>CFBundleSupportedPlatforms</key> - <array> - <string>iPhoneOS</string> - </array> - <key>CFBundleVersion</key> - <string>19</string> - <key>DTCompiler</key> - <string>com.apple.compilers.llvm.clang.1_0</string> - <key>DTPlatformBuild</key> - <string>12F69</string> - <key>DTPlatformName</key> - <string>iphoneos</string> - <key>DTPlatformVersion</key> - <string>8.3</string> - <key>DTSDKBuild</key> - <string>12F69</string> - <key>DTSDKName</key> - <string>iphoneos8.3</string> - <key>DTXcode</key> - <string>0631</string> - <key>DTXcodeBuild</key> - <string>6D1002</string> - <key>MinimumOSVersion</key> - <string>5.0</string> - <key>NSHumanReadableCopyright</key> - <string>Copyright © 2015 Twitter. All rights reserved.</string> - <key>UIDeviceFamily</key> - <array> - <integer>1</integer> - <integer>2</integer> - </array> -</dict> -</plist> 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 e714da08ba..0000000000 --- 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 index c3c6238503..c3c6238503 100644 --- a/platform/ios/vendor/Fabric.framework/Headers/FABAttributes.h +++ b/platform/ios/vendor/Fabric/FABAttributes.h diff --git a/platform/ios/vendor/Fabric.framework/Headers/FABKitProtocol.h b/platform/ios/vendor/Fabric/FABKitProtocol.h index 53e0656de0..53e0656de0 100644 --- a/platform/ios/vendor/Fabric.framework/Headers/FABKitProtocol.h +++ b/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 index a7c297517a..05e9630210 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 <Fabric/Fabric.h> +#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 index 8673be4827..8673be4827 100644 --- a/platform/ios/vendor/Fabric.framework/Headers/Fabric.h +++ b/platform/ios/vendor/Fabric/Fabric.h |