diff --git a/.gitmodules b/.gitmodules index 3c7fbc7d4..a79fc65d9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ -[submodule "Carthage/Checkouts/Bolts-ObjC"] - path = Carthage/Checkouts/Bolts-ObjC - url = https://github.com/BoltsFramework/Bolts-ObjC.git [submodule "Carthage/Checkouts/OHHTTPStubs"] path = Carthage/Checkouts/OHHTTPStubs url = https://github.com/AliSoftware/OHHTTPStubs.git diff --git a/Cartfile b/Cartfile deleted file mode 100644 index 6a5d24623..000000000 --- a/Cartfile +++ /dev/null @@ -1 +0,0 @@ -github "BoltsFramework/Bolts-ObjC" ~> 1.9 diff --git a/Cartfile.resolved b/Cartfile.resolved index 998c47267..eeaec32dc 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,5 +1,4 @@ github "AliSoftware/OHHTTPStubs" "826a9217fcd468220d154ed0075cbc1a20d0c5c9" -github "BoltsFramework/Bolts-ObjC" "1b247a7047546e9eecd36387a121977b53e2ea43" github "erikdoe/ocmock" "c4be5d9d9238fcd10449424f651fba2b7aff87c0" github "facebook/Tweaks" "858506f594462073a1dee82a4c8254e23d10aef0" github "facebook/xctool" "fe6fb5dfab112cfbb0a2fbda1f6a528abbe0d272" diff --git a/Carthage/Checkouts/Bolts-ObjC b/Carthage/Checkouts/Bolts-ObjC deleted file mode 160000 index 1b247a704..000000000 --- a/Carthage/Checkouts/Bolts-ObjC +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 1b247a7047546e9eecd36387a121977b53e2ea43 diff --git a/FBSDKCoreKit.podspec b/FBSDKCoreKit.podspec index 2b7ad63e7..138b51069 100644 --- a/FBSDKCoreKit.podspec +++ b/FBSDKCoreKit.podspec @@ -32,8 +32,6 @@ Pod::Spec.new do |s| s.requires_arc = ['FBSDKCoreKit/FBSDKCoreKit/*', 'FBSDKCoreKit/FBSDKCoreKit/Internal/**/*'] - s.ios.dependency 'Bolts', '~> 1.9' - s.public_header_files = 'FBSDKCoreKit/FBSDKCoreKit/*.h' s.source_files = 'FBSDKCoreKit/FBSDKCoreKit/**/*.{h,m}' s.resources = 'FacebookSDKStrings.bundle' diff --git a/FBSDKCoreKit/FBSDKCoreKit.xcodeproj/project.pbxproj b/FBSDKCoreKit/FBSDKCoreKit.xcodeproj/project.pbxproj index 455371f9a..d7fb97a64 100644 --- a/FBSDKCoreKit/FBSDKCoreKit.xcodeproj/project.pbxproj +++ b/FBSDKCoreKit/FBSDKCoreKit.xcodeproj/project.pbxproj @@ -12,7 +12,6 @@ buildConfigurationList = 9D2697711A5DF56700143BFC /* Build configuration list for PBXAggregateTarget "FBSDKCoreKit-Universal" */; buildPhases = ( 9D2697761A5DF69200143BFC /* ShellScript */, - 9D69FCCD1AA80EB10068EC76 /* ShellScript */, ); dependencies = ( 9D2697781A5DF6D600143BFC /* PBXTargetDependency */, @@ -51,7 +50,6 @@ 4AF47D131F424A8700A57A67 /* CoreImage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4AF47CFE1F424A8700A57A67 /* CoreImage.framework */; }; 520223F71D83C8D200CE0AB5 /* FBSDKDeviceRequestsHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = 520223F51D83C8D200CE0AB5 /* FBSDKDeviceRequestsHelper.h */; }; 520223F81D83C8D200CE0AB5 /* FBSDKDeviceRequestsHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 520223F61D83C8D200CE0AB5 /* FBSDKDeviceRequestsHelper.m */; }; - 524197FB215C25110098DE3B /* BFAppLinkResolverTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 524197E4215C25110098DE3B /* BFAppLinkResolverTests.m */; }; 5263EDBE215D97ED00FAAB0C /* FBSDKUserDataStore.h in Headers */ = {isa = PBXBuildFile; fileRef = F9169B822155A02000FA1789 /* FBSDKUserDataStore.h */; }; 5263EDD7215D98A400FAAB0C /* FBSDKUserDataStore.h in Headers */ = {isa = PBXBuildFile; fileRef = F9169B822155A02000FA1789 /* FBSDKUserDataStore.h */; }; 5263EDD8215D98B000FAAB0C /* FBSDKUserDataStore.m in Sources */ = {isa = PBXBuildFile; fileRef = F9169B832155A03C00FA1789 /* FBSDKUserDataStore.m */; }; @@ -117,8 +115,8 @@ 7E5557381A8D833100344F86 /* FBSDKAppLinkResolver.h in Headers */ = {isa = PBXBuildFile; fileRef = 7E5557361A8D833100344F86 /* FBSDKAppLinkResolver.h */; settings = {ATTRIBUTES = (Public, ); }; }; 7E55573C1A8D834B00344F86 /* FBSDKAppLinkResolverTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 7E55573A1A8D834B00344F86 /* FBSDKAppLinkResolverTests.m */; }; 7E55576C1A8EAC7D00344F86 /* libOHHTTPStubs.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7E55574C1A8E89A800344F86 /* libOHHTTPStubs.a */; }; - 7EB63D9F1A9BE730003A7AED /* FBSDKBoltsMeasurementEventListener.m in Sources */ = {isa = PBXBuildFile; fileRef = 7EB63D9D1A9BE730003A7AED /* FBSDKBoltsMeasurementEventListener.m */; }; - 7EB63DA01A9BE730003A7AED /* FBSDKBoltsMeasurementEventListener.h in Headers */ = {isa = PBXBuildFile; fileRef = 7EB63D9E1A9BE730003A7AED /* FBSDKBoltsMeasurementEventListener.h */; }; + 7EB63D9F1A9BE730003A7AED /* FBSDKMeasurementEventListener.m in Sources */ = {isa = PBXBuildFile; fileRef = 7EB63D9D1A9BE730003A7AED /* FBSDKMeasurementEventListener.m */; }; + 7EB63DA01A9BE730003A7AED /* FBSDKMeasurementEventListener.h in Headers */ = {isa = PBXBuildFile; fileRef = 7EB63D9E1A9BE730003A7AED /* FBSDKMeasurementEventListener.h */; }; 8131FB461D261DED000350FF /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 893F44A11A644512001DB0B6 /* CoreGraphics.framework */; }; 8131FB4A1D261E06000350FF /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 893F449F1A64450C001DB0B6 /* UIKit.framework */; }; 814AC7E31D1B528900D61E6C /* FBSDKAppEventsDeviceInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 5F7064081AF7342600E42ED7 /* FBSDKAppEventsDeviceInfo.m */; }; @@ -243,7 +241,7 @@ 81B71D0C1D19C87400933E93 /* FBSDKGraphRequestBody.m in Sources */ = {isa = PBXBuildFile; fileRef = 9DC658A11A6EE7E200B85AAF /* FBSDKGraphRequestBody.m */; }; 81B71D0D1D19C87400933E93 /* FBSDKUtility.m in Sources */ = {isa = PBXBuildFile; fileRef = 89C8B1981A8D7A15009B07F5 /* FBSDKUtility.m */; }; 81B71D0E1D19C87400933E93 /* FBSDKTestUsersManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D7E7E601ADF038800F53E38 /* FBSDKTestUsersManager.m */; }; - 81B71D0F1D19C87400933E93 /* FBSDKBoltsMeasurementEventListener.m in Sources */ = {isa = PBXBuildFile; fileRef = 7EB63D9D1A9BE730003A7AED /* FBSDKBoltsMeasurementEventListener.m */; }; + 81B71D0F1D19C87400933E93 /* FBSDKMeasurementEventListener.m in Sources */ = {isa = PBXBuildFile; fileRef = 7EB63D9D1A9BE730003A7AED /* FBSDKMeasurementEventListener.m */; }; 81B71D101D19C87400933E93 /* FBSDKProfilePictureView.m in Sources */ = {isa = PBXBuildFile; fileRef = 899C3CF71A8BF73A00EA8658 /* FBSDKProfilePictureView.m */; }; 81B71D111D19C87400933E93 /* FBSDKTriStateBOOL.m in Sources */ = {isa = PBXBuildFile; fileRef = 89D05A941AA0E89B00609300 /* FBSDKTriStateBOOL.m */; }; 81B71D121D19C87400933E93 /* FBSDKLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D6999FD1A76E166003AE384 /* FBSDKLogger.m */; }; @@ -301,7 +299,7 @@ 81B71D4A1D19C87400933E93 /* FBSDKAccessTokenCaching.h in Headers */ = {isa = PBXBuildFile; fileRef = 9D32A83B1A69941A000A936D /* FBSDKAccessTokenCaching.h */; }; 81B71D4B1D19C87400933E93 /* FBSDKBridgeAPIResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 894C0ADD1A6F1D1B009137EF /* FBSDKBridgeAPIResponse.h */; }; 81B71D4C1D19C87400933E93 /* FBSDKCoreKit+Internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 890414731A647D2E00617215 /* FBSDKCoreKit+Internal.h */; }; - 81B71D4D1D19C87400933E93 /* FBSDKBoltsMeasurementEventListener.h in Headers */ = {isa = PBXBuildFile; fileRef = 7EB63D9E1A9BE730003A7AED /* FBSDKBoltsMeasurementEventListener.h */; }; + 81B71D4D1D19C87400933E93 /* FBSDKMeasurementEventListener.h in Headers */ = {isa = PBXBuildFile; fileRef = 7EB63D9E1A9BE730003A7AED /* FBSDKMeasurementEventListener.h */; }; 81B71D4E1D19C87400933E93 /* FBSDKAudioResourceLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 89D05AA71AA1134000609300 /* FBSDKAudioResourceLoader.h */; }; 81B71D4F1D19C87400933E93 /* FBSDKLogo.h in Headers */ = {isa = PBXBuildFile; fileRef = 893F44931A6444DF001DB0B6 /* FBSDKLogo.h */; }; 81B71D501D19C87400933E93 /* FBSDKProfilePictureView.h in Headers */ = {isa = PBXBuildFile; fileRef = 899C3CF61A8BF73A00EA8658 /* FBSDKProfilePictureView.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -461,7 +459,6 @@ 89FB8C4A1A842A8A003CAE60 /* FBSDKWebDialogView.h in Headers */ = {isa = PBXBuildFile; fileRef = 89FB8C481A842A8A003CAE60 /* FBSDKWebDialogView.h */; }; 89FB8C4B1A842A8A003CAE60 /* FBSDKWebDialogView.m in Sources */ = {isa = PBXBuildFile; fileRef = 89FB8C491A842A8A003CAE60 /* FBSDKWebDialogView.m */; }; 9894BFFB1B73D8B300FBA6DB /* SafariServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9894BFFA1B73D8B300FBA6DB /* SafariServices.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; - 9D0043321AA91B9A008DEB62 /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9D0043301AA91B96008DEB62 /* Bolts.framework */; }; 9D0BC14F1A8D236200BE8BA4 /* FBSDKPaymentObserver.h in Headers */ = {isa = PBXBuildFile; fileRef = 9D0BC14A1A8D236200BE8BA4 /* FBSDKPaymentObserver.h */; }; 9D0BC1501A8D236200BE8BA4 /* FBSDKPaymentObserver.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D0BC14B1A8D236200BE8BA4 /* FBSDKPaymentObserver.m */; }; 9D0BC1511A8D236200BE8BA4 /* FBSDKTimeSpentData.h in Headers */ = {isa = PBXBuildFile; fileRef = 9D0BC14C1A8D236200BE8BA4 /* FBSDKTimeSpentData.h */; }; @@ -703,7 +700,6 @@ C5696FA8209CCEB4009C931F /* FBSDKSwizzler.m in Sources */ = {isa = PBXBuildFile; fileRef = C5696FA2209CCEB4009C931F /* FBSDKSwizzler.m */; }; C5696FA9209CCEB4009C931F /* FBSDKSwizzler.m in Sources */ = {isa = PBXBuildFile; fileRef = C5696FA2209CCEB4009C931F /* FBSDKSwizzler.m */; }; C5696FAA209CCEB4009C931F /* FBSDKSwizzler.m in Sources */ = {isa = PBXBuildFile; fileRef = C5696FA2209CCEB4009C931F /* FBSDKSwizzler.m */; }; - C5BB3EA621BB010200096874 /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C5BB3E8F21BB010100096874 /* Bolts.framework */; }; C5D25D3621795B790037B13D /* FBSDKCodelessIndexer.h in Headers */ = {isa = PBXBuildFile; fileRef = C5D25D3421795B790037B13D /* FBSDKCodelessIndexer.h */; }; C5D25D3721795B790037B13D /* FBSDKCodelessIndexer.h in Headers */ = {isa = PBXBuildFile; fileRef = C5D25D3421795B790037B13D /* FBSDKCodelessIndexer.h */; }; C5D25D3821795B790037B13D /* FBSDKCodelessIndexer.m in Sources */ = {isa = PBXBuildFile; fileRef = C5D25D3521795B790037B13D /* FBSDKCodelessIndexer.m */; }; @@ -728,27 +724,6 @@ /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - 2A8FB1821C921D9F00027121 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7E5557191A8D3D7400344F86 /* Bolts.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 1D5D7DD31BE3CE8200FD67C7; - remoteInfo = "Bolts-iOS-Dynamic"; - }; - 2A8FB1841C921D9F00027121 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7E5557191A8D3D7400344F86 /* Bolts.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81E94D6A1C2B8BF200A6291E; - remoteInfo = "Bolts-tvOS-Dynamic"; - }; - 2A8FB1861C921D9F00027121 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7E5557191A8D3D7400344F86 /* Bolts.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 819573F11C2B8ECB00BFCA39; - remoteInfo = "Bolts-watchOS-Dynamic"; - }; 52279E552150732600F31455 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 9D99470F1A9531B5003375EC /* OCMock.xcodeproj */; @@ -770,13 +745,6 @@ remoteGlobalIDString = 09110A4119805F4800D175E4; remoteInfo = "OHHTTPStubs iOS"; }; - 81B71E0B1D19CBF800933E93 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7E5557191A8D3D7400344F86 /* Bolts.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 1D5D7DA61BE3CE8200FD67C7; - remoteInfo = "Bolts-iOS-Dynamic"; - }; 892CCDA81B7BDB5700E3D351 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 7E55573F1A8E89A800344F86 /* OHHTTPStubs.xcodeproj */; @@ -798,13 +766,6 @@ remoteGlobalIDString = 9D2697461A5DF40700143BFC; remoteInfo = FBSDKCoreKit; }; - 9D4D736B1C1A3F24001C505D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7E5557191A8D3D7400344F86 /* Bolts.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 81ED94111BE147CF00795F05; - remoteInfo = "Bolts-iOS"; - }; 9D6DEF021BC2E5C7001A94ED /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 9D26973E1A5DF40700143BFC /* Project object */; @@ -812,27 +773,6 @@ remoteGlobalIDString = 9DB0FA721BC1CA71005EB8B1; remoteInfo = "FBSDKCoreKit (TV)"; }; - 9D7BA6941C10C4F0004A1181 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7E5557191A8D3D7400344F86 /* Bolts.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 81ED94111BE147CF00795F05; - remoteInfo = "Bolts-iOS"; - }; - 9D7BA69E1C10C4F0004A1181 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7E5557191A8D3D7400344F86 /* Bolts.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81ED94291BE147CF00795F05; - remoteInfo = "Bolts-iOS"; - }; - 9D7BA6A01C10C4F0004A1181 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7E5557191A8D3D7400344F86 /* Bolts.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81ED946E1BE14B5200795F05; - remoteInfo = "Bolts-OSX"; - }; 9D7BA6AD1C10C4F0004A1181 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 7E55573F1A8E89A800344F86 /* OHHTTPStubs.xcodeproj */; @@ -854,27 +794,6 @@ remoteGlobalIDString = EA100AB71BE15BE400129352; remoteInfo = "OHHTTPStubs tvOS Fmk Tests"; }; - 9D9947181A9531B5003375EC /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7E5557191A8D3D7400344F86 /* Bolts.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 8E8C8EE917F23D1D00E3F1C7; - remoteInfo = BoltsTests; - }; - 9D99471A1A9531B5003375EC /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7E5557191A8D3D7400344F86 /* Bolts.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 8E8C8F1917F241DA00E3F1C7; - remoteInfo = MacBoltsTests; - }; - 9D99471C1A9531B5003375EC /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7E5557191A8D3D7400344F86 /* Bolts.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 1EC3016018CDAA8400D06D07; - remoteInfo = BoltsTestUI; - }; 9D9947221A9531B5003375EC /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 9D99470F1A9531B5003375EC /* OCMock.xcodeproj */; @@ -931,27 +850,6 @@ remoteGlobalIDString = 095981C219806A7900807DBE; remoteInfo = "OHHTTPStubs Mac Framework"; }; - DB3A5F011BED707B003919E4 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7E5557191A8D3D7400344F86 /* Bolts.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = F5AFCA021BA752750076E927; - remoteInfo = "Bolts-tvOS"; - }; - DB3A5F031BED707B003919E4 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7E5557191A8D3D7400344F86 /* Bolts.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 8178F99C1BB0F87700AD289D; - remoteInfo = "Bolts-watchOS"; - }; - DB3A5F051BED707B003919E4 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7E5557191A8D3D7400344F86 /* Bolts.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = F5AFCA131BA752770076E927; - remoteInfo = "BoltsTests-tvOS"; - }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ @@ -963,7 +861,7 @@ 4AF47CFE1F424A8700A57A67 /* CoreImage.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreImage.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS11.0.sdk/System/Library/Frameworks/CoreImage.framework; sourceTree = DEVELOPER_DIR; }; 520223F51D83C8D200CE0AB5 /* FBSDKDeviceRequestsHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FBSDKDeviceRequestsHelper.h; sourceTree = ""; }; 520223F61D83C8D200CE0AB5 /* FBSDKDeviceRequestsHelper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FBSDKDeviceRequestsHelper.m; sourceTree = ""; }; - 524197E4215C25110098DE3B /* BFAppLinkResolverTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BFAppLinkResolverTests.m; sourceTree = ""; }; + 521726A621CDBF5000BC1840 /* AuthenticationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AuthenticationServices.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS12.1.sdk/System/Library/Frameworks/AuthenticationServices.framework; sourceTree = DEVELOPER_DIR; }; 52963A65215992F000C7B252 /* FBSDKAppLinkReturnToRefererView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FBSDKAppLinkReturnToRefererView.m; sourceTree = ""; }; 52963A67215992F000C7B252 /* FBSDKAppLinkTarget.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FBSDKAppLinkTarget.m; sourceTree = ""; }; 52963A68215992F000C7B252 /* FBSDKAppLinkNavigation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FBSDKAppLinkNavigation.m; sourceTree = ""; }; @@ -992,13 +890,12 @@ 7E253D841A8EB78300CCCFE7 /* FBSDKCoreKitTestUtility.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FBSDKCoreKitTestUtility.h; sourceTree = ""; }; 7E30916C1AA907BD004E91D5 /* FBSDKAppLinkUtility.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FBSDKAppLinkUtility.h; sourceTree = ""; }; 7E3091791AA907E0004E91D5 /* FBSDKAppLinkUtility.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FBSDKAppLinkUtility.m; sourceTree = ""; }; - 7E5557191A8D3D7400344F86 /* Bolts.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Bolts.xcodeproj; path = "../Carthage/Checkouts/Bolts-ObjC/Bolts.xcodeproj"; sourceTree = ""; }; 7E5557351A8D833100344F86 /* FBSDKAppLinkResolver.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FBSDKAppLinkResolver.m; sourceTree = ""; }; 7E5557361A8D833100344F86 /* FBSDKAppLinkResolver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FBSDKAppLinkResolver.h; sourceTree = ""; }; 7E55573A1A8D834B00344F86 /* FBSDKAppLinkResolverTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FBSDKAppLinkResolverTests.m; path = AppLinks/FBSDKAppLinkResolverTests.m; sourceTree = ""; }; 7E55573F1A8E89A800344F86 /* OHHTTPStubs.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = OHHTTPStubs.xcodeproj; path = ../Carthage/Checkouts/OHHTTPStubs/OHHTTPStubs/OHHTTPStubs.xcodeproj; sourceTree = ""; }; - 7EB63D9D1A9BE730003A7AED /* FBSDKBoltsMeasurementEventListener.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FBSDKBoltsMeasurementEventListener.m; path = AppLink/FBSDKBoltsMeasurementEventListener.m; sourceTree = ""; }; - 7EB63D9E1A9BE730003A7AED /* FBSDKBoltsMeasurementEventListener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FBSDKBoltsMeasurementEventListener.h; path = AppLink/FBSDKBoltsMeasurementEventListener.h; sourceTree = ""; }; + 7EB63D9D1A9BE730003A7AED /* FBSDKMeasurementEventListener.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FBSDKMeasurementEventListener.m; path = AppLink/FBSDKMeasurementEventListener.m; sourceTree = ""; }; + 7EB63D9E1A9BE730003A7AED /* FBSDKMeasurementEventListener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FBSDKMeasurementEventListener.h; path = AppLink/FBSDKMeasurementEventListener.h; sourceTree = ""; }; 814AC8571D1B528900D61E6C /* FBSDKCoreKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = FBSDKCoreKit.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 814AC8751D1B52DC00D61E6C /* FBSDKCoreKit-tvOS-Dynamic.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "FBSDKCoreKit-tvOS-Dynamic.xcconfig"; sourceTree = ""; }; 814AC8861D1B552600D61E6C /* Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = ""; }; @@ -1105,7 +1002,6 @@ 89FB8C481A842A8A003CAE60 /* FBSDKWebDialogView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FBSDKWebDialogView.h; sourceTree = ""; }; 89FB8C491A842A8A003CAE60 /* FBSDKWebDialogView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FBSDKWebDialogView.m; sourceTree = ""; }; 9894BFFA1B73D8B300FBA6DB /* SafariServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SafariServices.framework; path = System/Library/Frameworks/SafariServices.framework; sourceTree = SDKROOT; }; - 9D0043301AA91B96008DEB62 /* Bolts.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Bolts.framework; path = ../../build/Bolts.framework; sourceTree = ""; }; 9D0BC14A1A8D236200BE8BA4 /* FBSDKPaymentObserver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FBSDKPaymentObserver.h; sourceTree = ""; }; 9D0BC14B1A8D236200BE8BA4 /* FBSDKPaymentObserver.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FBSDKPaymentObserver.m; sourceTree = ""; }; 9D0BC14C1A8D236200BE8BA4 /* FBSDKTimeSpentData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FBSDKTimeSpentData.h; sourceTree = ""; }; @@ -1230,7 +1126,6 @@ C5696F32209BBC35009C931F /* FBSDKCodelessParameterComponent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FBSDKCodelessParameterComponent.h; sourceTree = ""; }; C5696FA1209CCEB3009C931F /* FBSDKSwizzler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FBSDKSwizzler.h; sourceTree = ""; }; C5696FA2209CCEB4009C931F /* FBSDKSwizzler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FBSDKSwizzler.m; sourceTree = ""; }; - C5BB3E8F21BB010100096874 /* Bolts.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Bolts.framework; path = ../Carthage/Build/iOS/Bolts.framework; sourceTree = ""; }; C5D25D3421795B790037B13D /* FBSDKCodelessIndexer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FBSDKCodelessIndexer.h; sourceTree = ""; }; C5D25D3521795B790037B13D /* FBSDKCodelessIndexer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FBSDKCodelessIndexer.m; sourceTree = ""; }; C5F6EC851FA24FAF009EB258 /* FBSDKPaymentObserverTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FBSDKPaymentObserverTests.m; sourceTree = ""; }; @@ -1259,7 +1154,6 @@ buildActionMask = 2147483647; files = ( F96ADE7A21E6ABB400F6043F /* StoreKit.framework in Frameworks */, - C5BB3EA621BB010200096874 /* Bolts.framework in Frameworks */, 81B71DD21D19C8CF00933E93 /* CoreGraphics.framework in Frameworks */, 81B71DCE1D19C8BF00933E93 /* UIKit.framework in Frameworks */, 81B71D461D19C87400933E93 /* SafariServices.framework in Frameworks */, @@ -1286,7 +1180,6 @@ 893F44A21A644512001DB0B6 /* CoreGraphics.framework in Frameworks */, 893F44A01A64450C001DB0B6 /* UIKit.framework in Frameworks */, 9D2697531A5DF40700143BFC /* FBSDKCoreKit.framework in Frameworks */, - 9D0043321AA91B9A008DEB62 /* Bolts.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1300,28 +1193,9 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 7E55571A1A8D3D7400344F86 /* Products */ = { - isa = PBXGroup; - children = ( - 9D7BA69F1C10C4F0004A1181 /* Bolts.framework */, - 2A8FB1831C921D9F00027121 /* Bolts.framework */, - 9D7BA6A11C10C4F0004A1181 /* Bolts.framework */, - DB3A5F021BED707B003919E4 /* Bolts.framework */, - 2A8FB1851C921D9F00027121 /* Bolts.framework */, - DB3A5F041BED707B003919E4 /* Bolts.framework */, - 2A8FB1871C921D9F00027121 /* Bolts.framework */, - 9D9947191A9531B5003375EC /* BoltsTests-iOS.xctest */, - 9D99471B1A9531B5003375EC /* BoltsTests-OSX.xctest */, - DB3A5F061BED707B003919E4 /* BoltsTests-tvOS.xctest */, - 9D99471D1A9531B5003375EC /* BoltsTestUI.app */, - ); - name = Products; - sourceTree = ""; - }; 7E5557391A8D833800344F86 /* AppLinks */ = { isa = PBXGroup; children = ( - 524197E4215C25110098DE3B /* BFAppLinkResolverTests.m */, 7E55573A1A8D834B00344F86 /* FBSDKAppLinkResolverTests.m */, ); name = AppLinks; @@ -1345,8 +1219,8 @@ 7EB63D901A9BE720003A7AED /* AppLink */ = { isa = PBXGroup; children = ( - 7EB63D9E1A9BE730003A7AED /* FBSDKBoltsMeasurementEventListener.h */, - 7EB63D9D1A9BE730003A7AED /* FBSDKBoltsMeasurementEventListener.m */, + 7EB63D9E1A9BE730003A7AED /* FBSDKMeasurementEventListener.h */, + 7EB63D9D1A9BE730003A7AED /* FBSDKMeasurementEventListener.m */, ); name = AppLink; sourceTree = ""; @@ -1488,6 +1362,7 @@ F96ADE6321E6ABB400F6043F /* StoreKit.framework */, C4513900202CBF1F0063275D /* WebKit.framework */, 4AF47CFE1F424A8700A57A67 /* CoreImage.framework */, + 521726A621CDBF5000BC1840 /* AuthenticationServices.framework */, 9894BFFA1B73D8B300FBA6DB /* SafariServices.framework */, 9DAD87751A8AA75700FFA324 /* libOCMock.a */, 9DEE5C891A67189800D750E1 /* XCTest.framework */, @@ -1496,7 +1371,6 @@ 9DEE5C7F1A6716D100D750E1 /* CoreText.framework */, 893F44A11A644512001DB0B6 /* CoreGraphics.framework */, 893F449F1A64450C001DB0B6 /* UIKit.framework */, - C5BB3E8F21BB010100096874 /* Bolts.framework */, ); name = Frameworks; sourceTree = ""; @@ -1699,7 +1573,6 @@ children = ( 9D99470F1A9531B5003375EC /* OCMock.xcodeproj */, 7E55573F1A8E89A800344F86 /* OHHTTPStubs.xcodeproj */, - 7E5557191A8D3D7400344F86 /* Bolts.xcodeproj */, ); name = Submodules; sourceTree = ""; @@ -1823,7 +1696,6 @@ 9D2697571A5DF40700143BFC /* Supporting Files */ = { isa = PBXGroup; children = ( - 9D0043301AA91B96008DEB62 /* Bolts.framework */, 9D2697581A5DF40700143BFC /* Info.plist */, ); name = "Supporting Files"; @@ -2015,7 +1887,7 @@ 81B71D4C1D19C87400933E93 /* FBSDKCoreKit+Internal.h in Headers */, 52963A97215992F400C7B252 /* FBSDKURL.h in Headers */, 52963A7F215992F400C7B252 /* FBSDKAppLinkResolving.h in Headers */, - 81B71D4D1D19C87400933E93 /* FBSDKBoltsMeasurementEventListener.h in Headers */, + 81B71D4D1D19C87400933E93 /* FBSDKMeasurementEventListener.h in Headers */, 81B71D4E1D19C87400933E93 /* FBSDKAudioResourceLoader.h in Headers */, C5D25D3721795B790037B13D /* FBSDKCodelessIndexer.h in Headers */, 52963AA4215993C100C7B252 /* FBSDKURL_Internal.h in Headers */, @@ -2131,7 +2003,7 @@ 9D32A8401A69941A000A936D /* FBSDKAccessTokenCaching.h in Headers */, 894C0ADF1A6F1D1B009137EF /* FBSDKBridgeAPIResponse.h in Headers */, 890414741A647D8800617215 /* FBSDKCoreKit+Internal.h in Headers */, - 7EB63DA01A9BE730003A7AED /* FBSDKBoltsMeasurementEventListener.h in Headers */, + 7EB63DA01A9BE730003A7AED /* FBSDKMeasurementEventListener.h in Headers */, 89D05AA91AA1134000609300 /* FBSDKAudioResourceLoader.h in Headers */, 893F44991A6444DF001DB0B6 /* FBSDKLogo.h in Headers */, 52963AAC2159A16E00C7B252 /* FBSDKMeasurementEvent.h in Headers */, @@ -2350,7 +2222,6 @@ buildRules = ( ); dependencies = ( - 81B71E0C1D19CBF800933E93 /* PBXTargetDependency */, ); name = "FBSDKCoreKit-Dynamic"; productName = FBSDKCoreKit; @@ -2369,7 +2240,6 @@ buildRules = ( ); dependencies = ( - 9D7BA6951C10C4F0004A1181 /* PBXTargetDependency */, ); name = FBSDKCoreKit; productName = FBSDKCoreKit; @@ -2387,7 +2257,6 @@ buildRules = ( ); dependencies = ( - 9D4D736C1C1A3F24001C505D /* PBXTargetDependency */, 9D4D73581C1A3ED9001C505D /* PBXTargetDependency */, 9DAD79FB1B7B27DE00DFEF8F /* PBXTargetDependency */, ); @@ -2448,10 +2317,6 @@ productRefGroup = 9D2697481A5DF40700143BFC /* Products */; projectDirPath = ""; projectReferences = ( - { - ProductGroup = 7E55571A1A8D3D7400344F86 /* Products */; - ProjectRef = 7E5557191A8D3D7400344F86 /* Bolts.xcodeproj */; - }, { ProductGroup = 9D9947101A9531B5003375EC /* Products */; ProjectRef = 9D99470F1A9531B5003375EC /* OCMock.xcodeproj */; @@ -2475,27 +2340,6 @@ /* End PBXProject section */ /* Begin PBXReferenceProxy section */ - 2A8FB1831C921D9F00027121 /* Bolts.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Bolts.framework; - remoteRef = 2A8FB1821C921D9F00027121 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 2A8FB1851C921D9F00027121 /* Bolts.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Bolts.framework; - remoteRef = 2A8FB1841C921D9F00027121 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 2A8FB1871C921D9F00027121 /* Bolts.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Bolts.framework; - remoteRef = 2A8FB1861C921D9F00027121 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; 52279E562150732600F31455 /* OCMock.framework */ = { isa = PBXReferenceProxy; fileType = wrapper.framework; @@ -2524,20 +2368,6 @@ remoteRef = 892CCDA81B7BDB5700E3D351 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 9D7BA69F1C10C4F0004A1181 /* Bolts.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Bolts.framework; - remoteRef = 9D7BA69E1C10C4F0004A1181 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 9D7BA6A11C10C4F0004A1181 /* Bolts.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Bolts.framework; - remoteRef = 9D7BA6A01C10C4F0004A1181 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; 9D7BA6AE1C10C4F0004A1181 /* OHHTTPStubs iOS Fmk Tests.xctest */ = { isa = PBXReferenceProxy; fileType = wrapper.cfbundle; @@ -2559,27 +2389,6 @@ remoteRef = 9D7BA6B11C10C4F0004A1181 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 9D9947191A9531B5003375EC /* BoltsTests-iOS.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = "BoltsTests-iOS.xctest"; - remoteRef = 9D9947181A9531B5003375EC /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 9D99471B1A9531B5003375EC /* BoltsTests-OSX.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = "BoltsTests-OSX.xctest"; - remoteRef = 9D99471A1A9531B5003375EC /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 9D99471D1A9531B5003375EC /* BoltsTestUI.app */ = { - isa = PBXReferenceProxy; - fileType = wrapper.application; - path = BoltsTestUI.app; - remoteRef = 9D99471C1A9531B5003375EC /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; 9D9947231A9531B5003375EC /* OCMock.framework */ = { isa = PBXReferenceProxy; fileType = wrapper.framework; @@ -2629,27 +2438,6 @@ remoteRef = ADEA17811B7ECA1A0070EDC0 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - DB3A5F021BED707B003919E4 /* Bolts.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Bolts.framework; - remoteRef = DB3A5F011BED707B003919E4 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - DB3A5F041BED707B003919E4 /* Bolts.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Bolts.framework; - remoteRef = DB3A5F031BED707B003919E4 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - DB3A5F061BED707B003919E4 /* BoltsTests-tvOS.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = "BoltsTests-tvOS.xctest"; - remoteRef = DB3A5F051BED707B003919E4 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; /* End PBXReferenceProxy section */ /* Begin PBXResourcesBuildPhase section */ @@ -2704,19 +2492,6 @@ shellPath = /bin/sh; shellScript = "../scripts/build-universal-framework.sh\n"; }; - 9D69FCCD1AA80EB10068EC76 /* ShellScript */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "rm -rf ../Carthage/Checkouts/Bolts-ObjC/build/ ../build/Bolts.framework\n../Carthage/Checkouts/Bolts-ObjC/scripts/build_framework.sh -c Release\ncp -R ../Carthage/Checkouts/Bolts-ObjC/build/Release-universal/Bolts.framework ../build/\n"; - }; 9D6DEEFD1BC2E546001A94ED /* ShellScript */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -2728,7 +2503,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "../scripts/build-universal-tvos-framework.sh"; + shellScript = "../scripts/build-universal-tvos-framework.sh\n"; }; /* End PBXShellScriptBuildPhase section */ @@ -2819,7 +2594,7 @@ 81B71D0C1D19C87400933E93 /* FBSDKGraphRequestBody.m in Sources */, 81B71D0D1D19C87400933E93 /* FBSDKUtility.m in Sources */, 81B71D0E1D19C87400933E93 /* FBSDKTestUsersManager.m in Sources */, - 81B71D0F1D19C87400933E93 /* FBSDKBoltsMeasurementEventListener.m in Sources */, + 81B71D0F1D19C87400933E93 /* FBSDKMeasurementEventListener.m in Sources */, 81B71D101D19C87400933E93 /* FBSDKProfilePictureView.m in Sources */, 81B71D111D19C87400933E93 /* FBSDKTriStateBOOL.m in Sources */, 81B71D121D19C87400933E93 /* FBSDKLogger.m in Sources */, @@ -2915,7 +2690,7 @@ 9DC658A61A6EE7E200B85AAF /* FBSDKGraphRequestBody.m in Sources */, 89C8B19A1A8D7A15009B07F5 /* FBSDKUtility.m in Sources */, 9D7E7E621ADF038800F53E38 /* FBSDKTestUsersManager.m in Sources */, - 7EB63D9F1A9BE730003A7AED /* FBSDKBoltsMeasurementEventListener.m in Sources */, + 7EB63D9F1A9BE730003A7AED /* FBSDKMeasurementEventListener.m in Sources */, 899C3CF91A8BF73A00EA8658 /* FBSDKProfilePictureView.m in Sources */, 89D05A961AA0E89B00609300 /* FBSDKTriStateBOOL.m in Sources */, 9D6999FF1A76E166003AE384 /* FBSDKLogger.m in Sources */, @@ -3009,7 +2784,6 @@ 9D3AF4661A9ED47900EEF724 /* FBSDKGraphRequestConnectionTests.m in Sources */, C51122A020A4BCEB0041DC94 /* FBSDKApplicationDelegateTests.m in Sources */, C51121CB20A27EF50041DC94 /* FBSDKEventBindingTests.m in Sources */, - 524197FB215C25110098DE3B /* BFAppLinkResolverTests.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3081,11 +2855,6 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - 81B71E0C1D19CBF800933E93 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "Bolts-iOS-Dynamic"; - targetProxy = 81B71E0B1D19CBF800933E93 /* PBXContainerItemProxy */; - }; 9D2697781A5DF6D600143BFC /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 9D2697461A5DF40700143BFC /* FBSDKCoreKit */; @@ -3096,21 +2865,11 @@ target = 9D2697461A5DF40700143BFC /* FBSDKCoreKit */; targetProxy = 9D4D73571C1A3ED9001C505D /* PBXContainerItemProxy */; }; - 9D4D736C1C1A3F24001C505D /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "Bolts-iOS"; - targetProxy = 9D4D736B1C1A3F24001C505D /* PBXContainerItemProxy */; - }; 9D6DEF031BC2E5C7001A94ED /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 9DB0FA721BC1CA71005EB8B1 /* FBSDKCoreKit_TV */; targetProxy = 9D6DEF021BC2E5C7001A94ED /* PBXContainerItemProxy */; }; - 9D7BA6951C10C4F0004A1181 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "Bolts-iOS"; - targetProxy = 9D7BA6941C10C4F0004A1181 /* PBXContainerItemProxy */; - }; 9DAD79FB1B7B27DE00DFEF8F /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = "OHHTTPStubs iOS StaticLib"; diff --git a/FBSDKCoreKit/FBSDKCoreKit.xcodeproj/xcshareddata/xcschemes/FBSDKCoreKit-Universal.xcscheme b/FBSDKCoreKit/FBSDKCoreKit.xcodeproj/xcshareddata/xcschemes/FBSDKCoreKit-Universal.xcscheme index d5e77f574..a3bd784f3 100644 --- a/FBSDKCoreKit/FBSDKCoreKit.xcodeproj/xcshareddata/xcschemes/FBSDKCoreKit-Universal.xcscheme +++ b/FBSDKCoreKit/FBSDKCoreKit.xcodeproj/xcshareddata/xcschemes/FBSDKCoreKit-Universal.xcscheme @@ -48,20 +48,6 @@ ReferencedContainer = "container:FBSDKCoreKit.xcodeproj"> - - - - ) -// Import it if it's available -#import -#else -// Otherwise - redeclare BFAppLinkResolving protocol to resolve the problem of missing symbols -// Please note: Bolts.framework is still required for AppLink resolving to work, -// but this allows FBSDKCoreKit to weakly link Bolts.framework as well as this enables clang modulemaps to work. - -/** - Implement this protocol to provide an alternate strategy for resolving - App Links that may include pre-fetching, caching, or querying for App Link - data from an index provided by a service provider. - */ -DEPRECATED_MSG_ATTRIBUTE("Use `FBSDKAppLinkResolving`") -@protocol BFAppLinkResolving - -/** - Asynchronously resolves App Link data for a given URL. - - @param url The URL to resolve into an App Link. - @return A BFTask that will return a BFAppLink for the given URL. - */ -- (BFTask *)appLinkFromURLInBackground:(NSURL *)url -DEPRECATED_MSG_ATTRIBUTE("Use `appLinkFromURL:handler:`"); - -@end - -#endif +NS_ASSUME_NONNULL_BEGIN /** - Provides an implementation of the BFAppLinkResolving protocol that uses the Facebook App Link + Provides an implementation of the FBSDKAppLinkResolving protocol that uses the Facebook App Link Index API to resolve App Links given a URL. It also provides an additional helper method that can resolve multiple App Links in a single call. - - - Usage of this type requires a client token. See `[FBSDKSettings setClientToken:]` and linking - Bolts.framework + Usage of this type requires a client token. See `[FBSDKSettings setClientToken:]` */ -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wdeprecated-declarations" -@interface FBSDKAppLinkResolver : NSObject -#pragma clang diagnostic pop - -/** - Asynchronously resolves App Link data for multiple URLs. - - @param urls An array of NSURLs to resolve into App Links. - @return A BFTask that will return dictionary mapping input NSURLs to their - corresponding BFAppLink. - You should set the client token before making this call. See `[FBSDKSettings setClientToken:]` - */ -- (BFTask *)appLinksFromURLsInBackground:(NSArray *)urls -DEPRECATED_MSG_ATTRIBUTE("Use `appLinkFromURLs:handler:`"); - -/** - Asynchronously resolves App Link data for a given URL. - - @param url The URL to resolve into an App Link. - @return A BFTask that will return a BFAppLink for the given URL. - */ -- (BFTask *)appLinkFromURLInBackground:(NSURL *)url -DEPRECATED_MSG_ATTRIBUTE("Use `appLinkFromURL:handler:`"); +@interface FBSDKAppLinkResolver : NSObject /** Asynchronously resolves App Link data for a given array of URLs. @@ -105,3 +48,5 @@ NS_EXTENSION_UNAVAILABLE_IOS("Not available in app extension"); + (instancetype)resolver; @end + +NS_ASSUME_NONNULL_END diff --git a/FBSDKCoreKit/FBSDKCoreKit/FBSDKAppLinkResolver.m b/FBSDKCoreKit/FBSDKCoreKit/FBSDKAppLinkResolver.m index b83ec5bb2..68a02e777 100644 --- a/FBSDKCoreKit/FBSDKCoreKit/FBSDKAppLinkResolver.m +++ b/FBSDKCoreKit/FBSDKCoreKit/FBSDKAppLinkResolver.m @@ -20,13 +20,9 @@ #import -#import -#import -#import -#import - #import "FBSDKAccessToken.h" #import "FBSDKAppLink.h" +#import "FBSDKAppLinkTarget.h" #import "FBSDKGraphRequest+Internal.h" #import "FBSDKGraphRequestConnection.h" #import "FBSDKInternalUtility.h" @@ -46,33 +42,21 @@ @interface FBSDKAppLinkResolver () -@property (nonatomic, strong) NSMutableDictionary *cachedBFAppLinks; @property (nonatomic, strong) NSMutableDictionary *cachedFBSDKAppLinks; @property (nonatomic, assign) UIUserInterfaceIdiom userInterfaceIdiom; @end @implementation FBSDKAppLinkResolver -static Class g_BFTaskCompletionSourceClass; -static Class g_BFAppLinkTargetClass; -static Class g_BFAppLinkClass; -static Class g_BFTaskClass; - + (void)initialize { if (self == [FBSDKAppLinkResolver class]) { - g_BFTaskCompletionSourceClass = [FBSDKInternalUtility - resolveBoltsClassWithName:@"BFTaskCompletionSource"]; - g_BFAppLinkTargetClass = [FBSDKInternalUtility resolveBoltsClassWithName:@"BFAppLinkTarget"]; - g_BFTaskClass = [FBSDKInternalUtility resolveBoltsClassWithName:@"BFTask"]; - g_BFAppLinkClass = [FBSDKInternalUtility resolveBoltsClassWithName:@"BFAppLink"]; } } - (instancetype)initWithUserInterfaceIdiom:(UIUserInterfaceIdiom)userInterfaceIdiom { if (self = [super init]) { - self.cachedBFAppLinks = [NSMutableDictionary dictionary]; self.cachedFBSDKAppLinks = [NSMutableDictionary dictionary]; self.userInterfaceIdiom = userInterfaceIdiom; } @@ -182,115 +166,6 @@ - (void)appLinksFromURLs:(NSArray *)urls handler:(FBSDKAppLinksFromURLA }]; } -- (BFTask *)appLinksFromURLsInBackground:(NSArray *)urls -{ - if (![FBSDKSettings clientToken] && ![FBSDKAccessToken currentAccessToken]) { - [FBSDKLogger singleShotLogEntry:FBSDKLoggingBehaviorDeveloperErrors - logEntry:@"A user access token or clientToken is required to use FBAppLinkResolver"]; - } - NSMutableDictionary *appLinks = [NSMutableDictionary dictionary]; - NSMutableArray *toFind = [NSMutableArray array]; - NSMutableArray *toFindStrings = [NSMutableArray array]; - - @synchronized (self.cachedBFAppLinks) { - for (NSURL *url in urls) { - if (self.cachedBFAppLinks[url]) { - appLinks[url] = self.cachedBFAppLinks[url]; - } else { - [toFind addObject:url]; -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wdeprecated-declarations" - NSString *toFindString = [url.absoluteString stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]; -#pragma clang diagnostic pop - if (toFindString) { - [toFindStrings addObject:toFindString]; - } - } - } - } - if (toFind.count == 0) { - // All of the URLs have already been found. - return [g_BFTaskClass taskWithResult:appLinks]; - } - NSMutableArray *fields = [NSMutableArray arrayWithObject:kIOSKey]; - - NSString *idiomSpecificField = nil; - - switch (self.userInterfaceIdiom) { - case UIUserInterfaceIdiomPad: - idiomSpecificField = kIPadKey; - break; - case UIUserInterfaceIdiomPhone: - idiomSpecificField = kIPhoneKey; - break; - default: - break; - } - if (idiomSpecificField) { - [fields addObject:idiomSpecificField]; - } - NSString *path = [NSString stringWithFormat:@"?fields=%@.fields(%@)&ids=%@", - kAppLinksKey, - [fields componentsJoinedByString:@","], - [toFindStrings componentsJoinedByString:@","]]; - FBSDKGraphRequest *request = [[FBSDKGraphRequest alloc] initWithGraphPath:path - parameters:nil - flags:FBSDKGraphRequestFlagDoNotInvalidateTokenOnError | FBSDKGraphRequestFlagDisableErrorRecovery]; - BFTaskCompletionSource *tcs = [g_BFTaskCompletionSourceClass taskCompletionSource]; - [request startWithCompletionHandler:^(FBSDKGraphRequestConnection *connection, id result, NSError *error) { - if (error) { - [tcs setError:error]; - return; - } - for (NSURL *url in toFind) { - id nestedObject = result[url.absoluteString][kAppLinksKey]; - NSMutableArray *rawTargets = [NSMutableArray array]; - if (idiomSpecificField) { - [rawTargets addObjectsFromArray:nestedObject[idiomSpecificField]]; - } - [rawTargets addObjectsFromArray:nestedObject[kIOSKey]]; - - NSMutableArray *targets = [NSMutableArray arrayWithCapacity:rawTargets.count]; - for (id rawTarget in rawTargets) { - [targets addObject:[g_BFAppLinkTargetClass appLinkTargetWithURL:[NSURL URLWithString:rawTarget[kURLKey]] - appStoreId:rawTarget[kIOSAppStoreIdKey] - appName:rawTarget[kIOSAppNameKey]]]; - } - - id webTarget = nestedObject[kWebKey]; - NSString *webFallbackString = webTarget[kURLKey]; - NSURL *fallbackUrl = webFallbackString ? [NSURL URLWithString:webFallbackString] : url; - - NSNumber *shouldFallback = webTarget[kShouldFallbackKey]; - if (shouldFallback && !shouldFallback.boolValue) { - fallbackUrl = nil; - } - - BFAppLink *link = [g_BFAppLinkClass appLinkWithSourceURL:url - targets:targets - webURL:fallbackUrl]; - @synchronized (self.cachedBFAppLinks) { - self.cachedBFAppLinks[url] = link; - } - appLinks[url] = link; - } - [tcs setResult:appLinks]; - }]; - return tcs.task; -} - -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wdeprecated-declarations" -- (BFTask *)appLinkFromURLInBackground:(NSURL *)url -{ - // Implement in terms of appLinksFromURLsInBackground - BFTask *resolveTask = [self appLinksFromURLsInBackground:@[url]]; - return [resolveTask continueWithSuccessBlock:^id(BFTask *task) { - return task.result[url]; - }]; -} -#pragma clang diagnostic pop - + (instancetype)resolver { return [[self alloc] initWithUserInterfaceIdiom:UI_USER_INTERFACE_IDIOM()]; diff --git a/FBSDKCoreKit/FBSDKCoreKit/FBSDKAppLinkUtility.h b/FBSDKCoreKit/FBSDKCoreKit/FBSDKAppLinkUtility.h index 8a971b23e..43f0202c7 100644 --- a/FBSDKCoreKit/FBSDKCoreKit/FBSDKAppLinkUtility.h +++ b/FBSDKCoreKit/FBSDKCoreKit/FBSDKAppLinkUtility.h @@ -69,11 +69,7 @@ typedef void (^FBSDKDeferredAppInviteHandler)(NSURL *url); DEPRECATED_MSG_ATTRIBUTE("This method is no longer available."); /* - Call this method to fetch promotion code from the url, if it's present. This function - requires Bolts framework. - - Note: This throws an exception if Bolts.framework is not linked. Add '[BFURL class]' in intialize method - of your AppDelegate. + Call this method to fetch promotion code from the url, if it's present. @param url App Link url that was passed to the app. diff --git a/FBSDKCoreKit/FBSDKCoreKit/FBSDKAppLinkUtility.m b/FBSDKCoreKit/FBSDKCoreKit/FBSDKAppLinkUtility.m index 9b180c23d..d724c9992 100644 --- a/FBSDKCoreKit/FBSDKCoreKit/FBSDKAppLinkUtility.m +++ b/FBSDKCoreKit/FBSDKCoreKit/FBSDKAppLinkUtility.m @@ -18,12 +18,11 @@ #import "FBSDKAppLinkUtility.h" -#import - #import "FBSDKAppEventsUtility.h" #import "FBSDKGraphRequest.h" #import "FBSDKInternalUtility.h" #import "FBSDKSettings.h" +#import "FBSDKURL.h" #import "FBSDKUtility.h" static NSString *const FBSDKLastDeferredAppLink = @"com.facebook.sdk:lastDeferredAppLink%@"; @@ -87,7 +86,7 @@ + (BOOL)fetchDeferredAppInvite:(FBSDKDeferredAppInviteHandler)handler + (NSString*)appInvitePromotionCodeFromURL:(NSURL*)url; { - BFURL *parsedUrl = [[FBSDKInternalUtility resolveBoltsClassWithName:@"BFURL"] URLWithURL:url]; + FBSDKURL *parsedUrl = [FBSDKURL URLWithURL:url]; NSDictionary *extras = parsedUrl.appLinkExtras; if (extras) { NSString *deeplinkContextString = extras[@"deeplink_context"]; diff --git a/FBSDKCoreKit/FBSDKCoreKit/FBSDKApplicationDelegate.m b/FBSDKCoreKit/FBSDKCoreKit/FBSDKApplicationDelegate.m index 5bdd10bb8..436e174ed 100644 --- a/FBSDKCoreKit/FBSDKCoreKit/FBSDKApplicationDelegate.m +++ b/FBSDKCoreKit/FBSDKCoreKit/FBSDKApplicationDelegate.m @@ -39,7 +39,7 @@ #import "FBSDKUtility.h" #if !TARGET_OS_TV -#import "FBSDKBoltsMeasurementEventListener.h" +#import "FBSDKMeasurementEventListener.h" #import "FBSDKBridgeAPIRequest.h" #import "FBSDKBridgeAPIResponse.h" #import "FBSDKContainerViewController.h" @@ -104,8 +104,8 @@ + (void)initializeWithLaunchData:(NSNotification *)note [[self sharedInstance] application:[UIApplication sharedApplication] didFinishLaunchingWithOptions:launchData]; #if !TARGET_OS_TV - // Register Listener for Bolts measurement events - [FBSDKBoltsMeasurementEventListener defaultListener]; + // Register Listener for App Link measurement events + [FBSDKMeasurementEventListener defaultListener]; #endif // Set the SourceApplication for time spent data. This is not going to update the value if the app has already launched. [FBSDKTimeSpentData setSourceApplication:launchData[UIApplicationLaunchOptionsSourceApplicationKey] diff --git a/FBSDKCoreKit/FBSDKCoreKit/FBSDKProfile.h b/FBSDKCoreKit/FBSDKCoreKit/FBSDKProfile.h index d0e245bb4..edb38e0be 100644 --- a/FBSDKCoreKit/FBSDKCoreKit/FBSDKProfile.h +++ b/FBSDKCoreKit/FBSDKCoreKit/FBSDKProfile.h @@ -111,7 +111,7 @@ FOUNDATION_EXPORT NSString *const FBSDKProfileChangeNewKey; /** A URL to the user's profile. - Consider using Bolts and `FBSDKAppLinkResolver` to resolve this + Consider using `FBSDKAppLinkResolver` to resolve this to an app link to link directly to the user's profile in the Facebook app. */ @property (nonatomic, readonly) NSURL *linkURL; diff --git a/FBSDKCoreKit/FBSDKCoreKit/Internal/AppLink/FBSDKBoltsMeasurementEventListener.h b/FBSDKCoreKit/FBSDKCoreKit/Internal/AppLink/FBSDKMeasurementEventListener.h similarity index 90% rename from FBSDKCoreKit/FBSDKCoreKit/Internal/AppLink/FBSDKBoltsMeasurementEventListener.h rename to FBSDKCoreKit/FBSDKCoreKit/Internal/AppLink/FBSDKMeasurementEventListener.h index c42431b80..12be5f427 100644 --- a/FBSDKCoreKit/FBSDKCoreKit/Internal/AppLink/FBSDKBoltsMeasurementEventListener.h +++ b/FBSDKCoreKit/FBSDKCoreKit/Internal/AppLink/FBSDKMeasurementEventListener.h @@ -18,6 +18,6 @@ #import -@interface FBSDKBoltsMeasurementEventListener : NSObject -+ (FBSDKBoltsMeasurementEventListener *)defaultListener; +@interface FBSDKMeasurementEventListener : NSObject ++ (FBSDKMeasurementEventListener *)defaultListener; @end diff --git a/FBSDKCoreKit/FBSDKCoreKit/Internal/AppLink/FBSDKBoltsMeasurementEventListener.m b/FBSDKCoreKit/FBSDKCoreKit/Internal/AppLink/FBSDKMeasurementEventListener.m similarity index 71% rename from FBSDKCoreKit/FBSDKCoreKit/Internal/AppLink/FBSDKBoltsMeasurementEventListener.m rename to FBSDKCoreKit/FBSDKCoreKit/Internal/AppLink/FBSDKMeasurementEventListener.m index 718e23b09..98cd036bf 100644 --- a/FBSDKCoreKit/FBSDKCoreKit/Internal/AppLink/FBSDKBoltsMeasurementEventListener.m +++ b/FBSDKCoreKit/FBSDKCoreKit/Internal/AppLink/FBSDKMeasurementEventListener.m @@ -16,37 +16,37 @@ // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -#import "FBSDKBoltsMeasurementEventListener.h" +#import "FBSDKMeasurementEventListener.h" #import "FBSDKAppEvents+Internal.h" #import "FBSDKTimeSpentData.h" #if __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_10_0 -static NSNotificationName const BoltsMeasurementEventNotification = @"com.parse.bolts.measurement_event"; +static NSNotificationName const FBSDKMeasurementEventNotification = @"com.facebook.facebook-objc-sdk.measurement_event"; #else -static NSString *const BoltsMeasurementEventNotification = @"com.parse.bolts.measurement_event"; +static NSString *const FBSDKMeasurementEventNotification = @"com.facebook.facebook-objc-sdk.measurement_event"; #endif -static NSString *const BoltsMeasurementEventName = @"event_name"; -static NSString *const BoltsMeasurementEventArgs = @"event_args"; -static NSString *const BoltsMeasurementEventPrefix = @"bf_"; +static NSString *const FBSDKMeasurementEventName = @"event_name"; +static NSString *const FBSDKMeasurementEventArgs = @"event_args"; +static NSString *const FBSDKMeasurementEventPrefix = @"bf_"; -@implementation FBSDKBoltsMeasurementEventListener +@implementation FBSDKMeasurementEventListener + (instancetype)defaultListener { static dispatch_once_t dispatchOnceLocker = 0; - static FBSDKBoltsMeasurementEventListener *defaultListener = nil; + static FBSDKMeasurementEventListener *defaultListener = nil; dispatch_once(&dispatchOnceLocker, ^{ defaultListener = [[self alloc] init]; NSNotificationCenter *center = [NSNotificationCenter defaultCenter]; [center addObserver:defaultListener selector:@selector(logFBAppEventForNotification:) - name:BoltsMeasurementEventNotification + name:FBSDKMeasurementEventNotification object:nil]; }); return defaultListener; @@ -55,25 +55,25 @@ + (instancetype)defaultListener - (void)logFBAppEventForNotification:(NSNotification *)note { // when catch al_nav_in event, we set source application for FBAppEvents. - if ([note.userInfo[BoltsMeasurementEventName] isEqualToString:@"al_nav_in"]) { - NSString *sourceApplication = note.userInfo[BoltsMeasurementEventArgs][@"sourceApplication"]; + if ([note.userInfo[FBSDKMeasurementEventName] isEqualToString:@"al_nav_in"]) { + NSString *sourceApplication = note.userInfo[FBSDKMeasurementEventArgs][@"sourceApplication"]; if (sourceApplication) { [FBSDKTimeSpentData setSourceApplication:sourceApplication isFromAppLink:YES]; } } - NSDictionary *eventArgs = note.userInfo[BoltsMeasurementEventArgs]; - NSMutableDictionary *logData = [[NSMutableDictionary alloc] init]; - for(NSString *key in eventArgs.allKeys) { + NSDictionary *eventArgs = note.userInfo[FBSDKMeasurementEventArgs]; + NSMutableDictionary *logData = [[NSMutableDictionary alloc] init]; + for (NSString *key in eventArgs.allKeys) { NSError *error = nil; NSRegularExpression *regex = [NSRegularExpression regularExpressionWithPattern:@"[^0-9a-zA-Z _-]" options:0 error:&error]; NSString *safeKey = [regex stringByReplacingMatchesInString:key options:0 - range:NSMakeRange(0, key.length) + range:NSMakeRange(0, [key length]) withTemplate:@"-"]; safeKey = [safeKey stringByTrimmingCharactersInSet:[NSCharacterSet characterSetWithCharactersInString:@" -"]]; logData[safeKey] = eventArgs[key]; } - [FBSDKAppEvents logImplicitEvent:[BoltsMeasurementEventPrefix stringByAppendingString:note.userInfo[BoltsMeasurementEventName]] + [FBSDKAppEvents logImplicitEvent:[FBSDKMeasurementEventPrefix stringByAppendingString:note.userInfo[FBSDKMeasurementEventName]] valueToSum:nil parameters:logData accessToken:nil]; diff --git a/FBSDKCoreKit/FBSDKCoreKit/Internal/FBSDKInternalUtility.h b/FBSDKCoreKit/FBSDKCoreKit/Internal/FBSDKInternalUtility.h index 6a5e0f53b..eb6dd320b 100644 --- a/FBSDKCoreKit/FBSDKCoreKit/Internal/FBSDKInternalUtility.h +++ b/FBSDKCoreKit/FBSDKCoreKit/Internal/FBSDKInternalUtility.h @@ -370,5 +370,4 @@ setJSONStringForObject:(id)object #define FB_BASE_URL @"facebook.com" -+ (Class)resolveBoltsClassWithName:(NSString *)className; @end diff --git a/FBSDKCoreKit/FBSDKCoreKit/Internal/FBSDKInternalUtility.m b/FBSDKCoreKit/FBSDKCoreKit/Internal/FBSDKInternalUtility.m index 71c2fe8b1..4c0459103 100644 --- a/FBSDKCoreKit/FBSDKCoreKit/Internal/FBSDKInternalUtility.m +++ b/FBSDKCoreKit/FBSDKCoreKit/Internal/FBSDKInternalUtility.m @@ -764,19 +764,6 @@ + (BOOL)areAllPermissionsPublishPermissions:(NSSet *)permissions return YES; } -+ (Class)resolveBoltsClassWithName:(NSString *)className; -{ - Class clazz = NSClassFromString(className); - if (clazz == nil) { - NSString *message = [NSString stringWithFormat:@"Unable to load class %@. Did you link Bolts.framework?", className]; - @throw [NSException exceptionWithName:NSInternalInconsistencyException - reason:message - userInfo:nil]; - } - - return clazz; -} - + (BOOL)isUnity { NSString *userAgentSuffix = [FBSDKSettings userAgentSuffix]; diff --git a/FBSDKCoreKit/FBSDKCoreKit/Internal/FBSDKMeasurementEvent_Internal.h b/FBSDKCoreKit/FBSDKCoreKit/Internal/FBSDKMeasurementEvent_Internal.h index e3b039fd8..e020f61d0 100644 --- a/FBSDKCoreKit/FBSDKCoreKit/Internal/FBSDKMeasurementEvent_Internal.h +++ b/FBSDKCoreKit/FBSDKCoreKit/Internal/FBSDKMeasurementEvent_Internal.h @@ -21,7 +21,7 @@ NS_ASSUME_NONNULL_BEGIN /*! - Provides methods for posting notifications from the Bolts framework + Provides methods for posting notifications from App Links */ @interface FBSDKMeasurementEvent (Internal) diff --git a/FBSDKCoreKit/FBSDKCoreKitTests/FBSDKAppLinkUtilityTests.m b/FBSDKCoreKit/FBSDKCoreKitTests/FBSDKAppLinkUtilityTests.m index 6f1916be1..c6920b2ff 100644 --- a/FBSDKCoreKit/FBSDKCoreKitTests/FBSDKAppLinkUtilityTests.m +++ b/FBSDKCoreKit/FBSDKCoreKitTests/FBSDKAppLinkUtilityTests.m @@ -22,10 +22,10 @@ #import "FBSDKAppLinkUtility.h" -@interface BFURLAppInvitesTests : XCTestCase +@interface FBSDKURLAppInvitesTests : XCTestCase @end -@implementation BFURLAppInvitesTests +@implementation FBSDKURLAppInvitesTests - (void)testWithNoPromoCode { diff --git a/FBSDKCoreKit/FBSDKCoreKitTests/Internal/BFAppLinkResolverTests.m b/FBSDKCoreKit/FBSDKCoreKitTests/Internal/BFAppLinkResolverTests.m deleted file mode 100644 index 08d6f498c..000000000 --- a/FBSDKCoreKit/FBSDKCoreKitTests/Internal/BFAppLinkResolverTests.m +++ /dev/null @@ -1,551 +0,0 @@ -// Copyright (c) 2014-present, Facebook, Inc. All rights reserved. -// -// You are hereby granted a non-exclusive, worldwide, royalty-free license to use, -// copy, modify, and distribute this software in source code or binary form for use -// in connection with the web services and APIs provided by Facebook. -// -// As with any software that integrates with the Facebook platform, your use of -// this software is subject to the Facebook Developer Principles and Policies -// [http://developers.facebook.com/policy/]. This copyright notice shall be -// included in all copies or substantial portions of the software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS -// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR -// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -#import - -#import - -#import -#import - -#import "FBSDKAppLinkResolver.h" -#import "FBSDKCoreKitTestUtility.h" -#import "FBSDKInternalUtility.h" -#import "FBSDKSettings.h" - -static NSString *const kAppLinkURLString = @"http://example.com/1234567890"; -static NSString *const kAppLinkURL2String = @"http://example.com/0987654321"; -static NSString *const kAppLinksKey = @"app_links"; -static id g_mockAccountStoreAdapter; - -typedef void (^HTTPStubCallback)(NSURLRequest *request); - -@interface NSURL (BFAppLinkResolverTests) - -@property (nonatomic, readonly, strong) id queryParameters; - -@end - -@interface FBSDKAppLinkResolver (BFAppLinkResolverTests) - -- (instancetype)initWithUserInterfaceIdiom:(UIUserInterfaceIdiom)userInterfaceIdiom; - -@end - -@interface BFAppLinkResolverTests : XCTestCase -@end - -@implementation BFAppLinkResolverTests -{ - id _mockNSBundle; -} - -+ (void)setUp -{ - g_mockAccountStoreAdapter = [FBSDKCoreKitTestUtility mockAccountStoreAdapter]; -} - -+ (void)tearDown -{ - [g_mockAccountStoreAdapter stopMocking]; - g_mockAccountStoreAdapter = nil; -} - -- (void)waitForTaskOnMainThread:(BFTask *)task -{ - while (!task.isCompleted) { - [[NSRunLoop currentRunLoop] runMode:NSDefaultRunLoopMode - beforeDate:[NSDate dateWithTimeIntervalSinceNow:0.1]]; - } -} - -#pragma mark - HTTP stubbing helpers - -- (void)stubAllResponsesWithResult:(id)result -{ - [self stubAllResponsesWithResult:result statusCode:200]; -} - -- (void)stubAllResponsesWithResult:(id)result - statusCode:(int)statusCode -{ - [self stubAllResponsesWithResult:result statusCode:statusCode callback:nil]; -} - -- (void)stubAllResponsesWithResult:(id)result - statusCode:(int)statusCode - callback:(HTTPStubCallback)callback -{ - return [self stubMatchingRequestsWithResponses:@{@"" : result} - statusCode:statusCode - callback:callback]; -} - -- (void)stubMatchingRequestsWithResponses:(NSDictionary *)requestsAndResponses - statusCode:(int)statusCode - callback:(HTTPStubCallback)callback -{ - id (^matchingKey)(NSString *) = ^id (NSString *urlString) { - for (NSString *substring in requestsAndResponses.allKeys) { - // The first @"" always matches - if (substring.length == 0 || - [urlString rangeOfString:substring].location != NSNotFound) { - return substring; - } - } - return nil; - }; - - [OHHTTPStubs stubRequestsPassingTest:^BOOL(NSURLRequest *request) { - if (callback) { - callback(request); - } - - return matchingKey(request.URL.absoluteString) != nil; - } withStubResponse:^OHHTTPStubsResponse *(NSURLRequest *request) { - id result = requestsAndResponses[matchingKey(request.URL.absoluteString)]; - NSData *data = [[FBSDKInternalUtility JSONStringForObject:result - error:NULL - invalidObjectHandler:NULL] dataUsingEncoding:NSUTF8StringEncoding]; - - return [OHHTTPStubsResponse responseWithData:data - statusCode:statusCode - headers:nil]; - }]; -} - -#pragma mark - test cases - -- (void)setUp -{ - _mockNSBundle = [FBSDKCoreKitTestUtility mainBundleMock]; -} - -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wdeprecated-declarations" - -- (void)testAsksForPhoneDataOnPhone -{ - __block BOOL askedForPhone = NO; - [OHHTTPStubs stubRequestsPassingTest:^BOOL(NSURLRequest *request) { - NSDictionary *queryParameters = - [FBSDKInternalUtility dictionaryFromFBURL:request.URL]; - askedForPhone = [queryParameters[@"fields"] rangeOfString:@"iphone"].location != NSNotFound; - return YES; - } withStubResponse:^OHHTTPStubsResponse *(NSURLRequest *request) { - return [OHHTTPStubsResponse responseWithData:[NSData data] - statusCode:200 - headers:nil]; - }]; - - FBSDKAppLinkResolver *resolver = [[FBSDKAppLinkResolver alloc] initWithUserInterfaceIdiom:UIUserInterfaceIdiomPhone]; - - BFTask *task = [resolver appLinkFromURLInBackground:[NSURL URLWithString:kAppLinkURLString]]; - [self waitForTaskOnMainThread:task]; - - XCTAssertTrue(askedForPhone); -} - -- (void)testUsesPhoneDataOnPhone -{ - [self stubAllResponsesWithResult:@{ - kAppLinkURLString : @{ - kAppLinksKey: @{ - @"iphone": @[ - @{ - @"app_name": @"Example", - @"app_store_id": @"456", - @"url": @"example://things/1234567890" - } - ], - @"ios": @[ - @{ - @"app_name": @"Example", - @"app_store_id": @"123", - @"url": @"example://things/1234567890" - } - ], - }, - @"id": kAppLinkURLString - } - }]; - - FBSDKAppLinkResolver *resolver = [[FBSDKAppLinkResolver alloc] initWithUserInterfaceIdiom:UIUserInterfaceIdiomPhone]; - - BFTask *task = [resolver appLinkFromURLInBackground:[NSURL URLWithString:kAppLinkURLString]]; - [self waitForTaskOnMainThread:task]; - - BFAppLink *link = task.result; - XCTAssertNotNil(link); - XCTAssertEqual(link.sourceURL.absoluteString, kAppLinkURLString); - XCTAssertEqualObjects([link.targets[0] appStoreId], @"456"); - XCTAssertEqualObjects([link.targets[1] appStoreId], @"123"); -} - -- (void)testAsksForPadDataOnPad -{ - __block BOOL askedForPad = NO; - [OHHTTPStubs stubRequestsPassingTest:^BOOL(NSURLRequest *request) { - NSDictionary *queryParameters = - [FBSDKInternalUtility dictionaryFromFBURL:request.URL]; - // do an "OR" because we only need to verify we asked for it once (in cases where unrelated network requests - // were resetting the flag incorrectly back to NO). - askedForPad |= [queryParameters[@"fields"] rangeOfString:@"ipad"].location != NSNotFound; - return YES; - } withStubResponse:^OHHTTPStubsResponse *(NSURLRequest *request) { - return [OHHTTPStubsResponse responseWithData:[NSData data] - statusCode:200 - headers:nil]; - }]; - - FBSDKAppLinkResolver *resolver = [[FBSDKAppLinkResolver alloc] initWithUserInterfaceIdiom:UIUserInterfaceIdiomPad]; - - BFTask *task = [resolver appLinkFromURLInBackground:[NSURL URLWithString:kAppLinkURLString]]; - [self waitForTaskOnMainThread:task]; - - XCTAssertTrue(askedForPad); -} - -- (void)testUsesPadDataOnPad -{ - [self stubAllResponsesWithResult:@{ - kAppLinkURLString : @{ - kAppLinksKey: @{ - @"ipad": @[ - @{ - @"app_name": @"Example", - @"app_store_id": @"456", - @"url": @"example://things/1234567890" - } - ], - @"ios": @[ - @{ - @"app_name": @"Example", - @"app_store_id": @"123", - @"url": @"example://things/1234567890" - } - ], - }, - @"id": kAppLinkURLString - } - }]; - - FBSDKAppLinkResolver *resolver = [[FBSDKAppLinkResolver alloc] initWithUserInterfaceIdiom:UIUserInterfaceIdiomPad]; - - BFTask *task = [resolver appLinkFromURLInBackground:[NSURL URLWithString:kAppLinkURLString]]; - [self waitForTaskOnMainThread:task]; - - BFAppLink *link = task.result; - XCTAssertNotNil(link); - XCTAssertEqual(link.sourceURL.absoluteString, kAppLinkURLString); - XCTAssertEqualObjects([link.targets[0] appStoreId], @"456"); - XCTAssertEqualObjects([link.targets[1] appStoreId], @"123"); -} - - -- (void)testIgnoresAndroidData -{ - // We are not asking for it, but just make sure we ignore any non-iOS-platform data we get, to be safe. - [self stubAllResponsesWithResult:@{ - kAppLinkURLString : @{ - kAppLinksKey: @{ - @"android": @[ - @{ - @"app_name": @"Example", - @"package": @"com.example.app", - @"url": @"example://things/1234567890" - } - ], - @"ios": @[ - @{ - @"app_name": @"Example", - @"app_store_id": @"123", - @"url": @"example://things/1234567890" - } - ], - }, - @"id": kAppLinkURLString - } - }]; - - FBSDKAppLinkResolver *resolver = [FBSDKAppLinkResolver resolver]; - - BFTask *task = [resolver appLinkFromURLInBackground:[NSURL URLWithString:kAppLinkURLString]]; - [self waitForTaskOnMainThread:task]; - - BFAppLink *link = task.result; - XCTAssertNotNil(link); - XCTAssertEqualObjects([link.targets[0] appStoreId], @"123"); -} - -- (void)testHandlesNoTargets -{ - [self stubAllResponsesWithResult:@{ - kAppLinkURLString : @{ - @"id": kAppLinkURLString - } - }]; - - FBSDKAppLinkResolver *resolver = [FBSDKAppLinkResolver resolver]; - - BFTask *task = [resolver appLinkFromURLInBackground:[NSURL URLWithString:kAppLinkURLString]]; - [self waitForTaskOnMainThread:task]; - - BFAppLink *link = task.result; - XCTAssertNotNil(link); - XCTAssertEqual(link.sourceURL.absoluteString, kAppLinkURLString); - XCTAssertEqual(link.targets.count, 0); -} - -- (void)testHandlesMultipleURLs -{ - [self stubAllResponsesWithResult:@{ - kAppLinkURLString : @{ - @"id": kAppLinkURLString - }, - kAppLinkURL2String : @{ - @"id": kAppLinkURL2String - } - }]; - - FBSDKAppLinkResolver *resolver = [FBSDKAppLinkResolver resolver]; - - BFTask *task = [resolver appLinksFromURLsInBackground:@[[NSURL URLWithString:kAppLinkURLString], [NSURL URLWithString:kAppLinkURL2String]]]; - [self waitForTaskOnMainThread:task]; - - NSDictionary *links = task.result; - XCTAssertNotNil(links); - XCTAssertEqual(links.count, 2); - XCTAssertEqual([links[[NSURL URLWithString:kAppLinkURLString]] sourceURL].absoluteString, kAppLinkURLString); - XCTAssertEqual([links[[NSURL URLWithString:kAppLinkURL2String]] sourceURL].absoluteString, kAppLinkURL2String); -} - -- (void)testSetsFallbackIfNotSpecified -{ - [self stubAllResponsesWithResult:@{ - kAppLinkURLString : @{ - @"id": kAppLinkURLString - } - }]; - - FBSDKAppLinkResolver *resolver = [FBSDKAppLinkResolver resolver]; - - BFTask *task = [resolver appLinkFromURLInBackground:[NSURL URLWithString:kAppLinkURLString]]; - [self waitForTaskOnMainThread:task]; - - BFAppLink *link = task.result; - XCTAssertNotNil(link); - XCTAssertEqual(link.webURL.absoluteString, kAppLinkURLString); -} - -- (void)testSetsFallbackIfSpecified -{ - [self stubAllResponsesWithResult:@{ - kAppLinkURLString : @{ - kAppLinksKey : @{ - @"web": @{ - @"url" : @"http://www.example.com/somethingelse", - @"should_fallback": @"true" - } - }, - @"id": kAppLinkURLString - } - }]; - - FBSDKAppLinkResolver *resolver = [FBSDKAppLinkResolver resolver]; - - BFTask *task = [resolver appLinkFromURLInBackground:[NSURL URLWithString:kAppLinkURLString]]; - [self waitForTaskOnMainThread:task]; - - BFAppLink *link = task.result; - XCTAssertNotNil(link); - XCTAssertEqualObjects(link.webURL.absoluteString, @"http://www.example.com/somethingelse"); -} - -- (void)testUsesSourceAsFallbackIfSpecified -{ - [self stubAllResponsesWithResult:@{ - kAppLinkURLString : @{ - kAppLinksKey: @{ - @"web": @{ - @"should_fallback": @"true" - } - }, - @"id": kAppLinkURLString, - } - }]; - - FBSDKAppLinkResolver *resolver = [FBSDKAppLinkResolver resolver]; - - BFTask *task = [resolver appLinkFromURLInBackground:[NSURL URLWithString:kAppLinkURLString]]; - [self waitForTaskOnMainThread:task]; - - BFAppLink *link = task.result; - XCTAssertNotNil(link); - XCTAssertEqual(link.webURL.absoluteString, kAppLinkURLString); -} - -- (void)testSetsNoFallbackIfSpecified -{ - [self stubAllResponsesWithResult:@{ - kAppLinkURLString : @{ - kAppLinksKey : @{ - @"web": @{ - @"url" : @"http://www.example.com/somethingelse", - @"should_fallback": @"false" - } - }, - @"id": kAppLinkURLString - } - }]; - - FBSDKAppLinkResolver *resolver = [FBSDKAppLinkResolver resolver]; - - BFTask *task = [resolver appLinkFromURLInBackground:[NSURL URLWithString:kAppLinkURLString]]; - [self waitForTaskOnMainThread:task]; - - BFAppLink *link = task.result; - XCTAssertNotNil(link); - XCTAssertNil(link.webURL.absoluteString); -} - -- (void)testHandlesError -{ - // We are not asking for it, but just make sure we ignore any non-iOS-platform data we get, to be safe. - [self stubAllResponsesWithResult:@{ - @"error" : @{} - } - statusCode:404]; - - FBSDKAppLinkResolver *resolver = [FBSDKAppLinkResolver resolver]; - - BFTask *task = [resolver appLinkFromURLInBackground:[NSURL URLWithString:kAppLinkURLString]]; - [self waitForTaskOnMainThread:task]; - - BFAppLink *link = task.result; - XCTAssertNil(link); - - NSError *error = task.error; - XCTAssertNotNil(error); -} - -- (void)testResultsAreCachedAndCacheIsUsed -{ - __block NSUInteger callCount = 0; - - [self stubAllResponsesWithResult:@{ - kAppLinkURLString : @{ - kAppLinksKey : @{ - @"iphone": @[ - @{ - @"app_name": @"Example", - @"app_store_id": @"456", - @"url": @"example://things/1234567890" - } - ], - }, - @"id": kAppLinkURLString - } - } - statusCode:200 - callback:^(NSURLRequest *request) { - ++callCount; - }]; - - FBSDKAppLinkResolver *resolver = [FBSDKAppLinkResolver resolver]; - - BFTask *task = [resolver appLinkFromURLInBackground:[NSURL URLWithString:kAppLinkURLString]]; - [self waitForTaskOnMainThread:task]; - - // Note: callCount is not necessarily 1, as the callback may be called multiple times during processing of the request. - NSUInteger expectedCallCount = callCount; - - task = [resolver appLinkFromURLInBackground:[NSURL URLWithString:kAppLinkURLString]]; - [self waitForTaskOnMainThread:task]; - - XCTAssertEqual(callCount, expectedCallCount); -} - -- (void)testMixOfCachedAndUncached -{ - __block NSMutableDictionary *callCounts = - [NSMutableDictionary dictionary]; - - [self stubMatchingRequestsWithResponses:@{ - @"1234567890" : @{ - kAppLinkURLString : @{ - kAppLinksKey : @{ - @"iphone": @[ - @{ - @"app_name": @"Example", - @"app_store_id": @"456", - @"url": @"example://things/1234567890" - } - ], - }, - @"id": kAppLinkURLString - } - }, - @"0987654321" : @{ - kAppLinkURL2String : @{ - kAppLinksKey : @{ - @"iphone": @[ - @{ - @"app_name": @"Example", - @"app_store_id": @"456", - @"url": @"example://things/1234567890" - } - ], - }, - @"id": kAppLinkURL2String - } - } - } - statusCode:200 - callback:^(NSURLRequest *request) { - NSUInteger callCount = callCounts[request.URL.absoluteString].unsignedIntegerValue; - ++callCount; - callCounts[request.URL.absoluteString] = @(callCount); - }]; - - FBSDKAppLinkResolver *resolver = [FBSDKAppLinkResolver resolver]; - - // Prime the cache with kAppLinkURL - BFTask *task = [resolver appLinkFromURLInBackground:[NSURL URLWithString:kAppLinkURLString]]; - [self waitForTaskOnMainThread:task]; - - XCTAssertEqual(callCounts.count, 1); - - // Note: callCount is not necessarily 1, as the callback may be called multiple times during processing of the request. - NSString *firstCallKey = callCounts.allKeys[0]; - NSUInteger expectedCallCount = callCounts[firstCallKey].unsignedIntegerValue; - - // Now request them both; we expect the call count for kAppLinkURL to be unchanged. - task = [resolver appLinksFromURLsInBackground:@[[NSURL URLWithString:kAppLinkURLString], [NSURL URLWithString:kAppLinkURL2String]]]; - [self waitForTaskOnMainThread:task]; - - XCTAssertEqual(callCounts.count, 2); - XCTAssertEqual([callCounts[firstCallKey] unsignedIntegerValue], expectedCallCount); - - NSDictionary *links = task.result; - XCTAssertEqual(links.count, 2); -} - -#pragma clang diagnostic pop - -@end diff --git a/FBSDKIntegrationTests/FBSDKIntegrationTests.xcodeproj/project.pbxproj b/FBSDKIntegrationTests/FBSDKIntegrationTests.xcodeproj/project.pbxproj index 1ac6357a6..8dfbf6838 100644 --- a/FBSDKIntegrationTests/FBSDKIntegrationTests.xcodeproj/project.pbxproj +++ b/FBSDKIntegrationTests/FBSDKIntegrationTests.xcodeproj/project.pbxproj @@ -36,7 +36,6 @@ 9D2BA0A71AB9E110004C7C0C /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 9D2BA0A61AB9E110004C7C0C /* Images.xcassets */; }; 9D2BA0AA1AB9E110004C7C0C /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9D2BA0A81AB9E110004C7C0C /* LaunchScreen.xib */; }; 9D2BA0BF1AB9EAEE004C7C0C /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9D1999E91A7AF7F100CAD112 /* UIKit.framework */; }; - 9D4D73521C19F4D0001C505D /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9D4D73501C19F30E001C505D /* Bolts.framework */; }; 9D5F8ADC1A97C15400EC4FD3 /* FBSDKAppEventsStateManagerIntegrationTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D5F8ADB1A97C15400EC4FD3 /* FBSDKAppEventsStateManagerIntegrationTests.m */; }; 9D9ACC3B1ABCAF950050BF2E /* FBSDKShareAPIIntegrationTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D9ACC3A1ABCAF950050BF2E /* FBSDKShareAPIIntegrationTests.m */; }; 9DA81B071AA5092800B9FE0B /* FBSDKProfileIntegrationTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 9DA81B061AA5092800B9FE0B /* FBSDKProfileIntegrationTests.m */; }; @@ -224,9 +223,7 @@ 9D2BA0A41AB9E110004C7C0C /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; 9D2BA0A61AB9E110004C7C0C /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = ""; }; 9D2BA0A91AB9E110004C7C0C /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = ""; }; - 9D4D73501C19F30E001C505D /* Bolts.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Bolts.framework; path = ../build/Bolts.framework; sourceTree = ""; }; 9D5F8ADB1A97C15400EC4FD3 /* FBSDKAppEventsStateManagerIntegrationTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FBSDKAppEventsStateManagerIntegrationTests.m; sourceTree = ""; }; - 9D5FB1FD1C19EE06002F07BD /* Bolts.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Bolts.framework; path = "../Carthage/Checkouts/Bolts-ObjC/build/Debug-iphoneos/Bolts.framework"; sourceTree = ""; }; 9D9ACC3A1ABCAF950050BF2E /* FBSDKShareAPIIntegrationTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FBSDKShareAPIIntegrationTests.m; sourceTree = ""; }; 9DA81B061AA5092800B9FE0B /* FBSDKProfileIntegrationTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FBSDKProfileIntegrationTests.m; sourceTree = ""; }; 9DAD79F81B7B244B00DFEF8F /* libOHHTTPStubs.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libOHHTTPStubs.a; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -243,7 +240,6 @@ 8118B6CD1D0A6FF300962084 /* FBSDKShareKit.framework in Frameworks */, 9D1999D21A7AF63600CAD112 /* libOCMock.a in Frameworks */, 9D18A8FB1A95981F00A41042 /* libOHHTTPStubs.a in Frameworks */, - 9D4D73521C19F4D0001C505D /* Bolts.framework in Frameworks */, 9D1999EA1A7AF7F100CAD112 /* UIKit.framework in Frameworks */, 9D1999E81A7AF7E900CAD112 /* XCTest.framework in Frameworks */, 9D1999E61A7AF7C900CAD112 /* Foundation.framework in Frameworks */, @@ -375,8 +371,6 @@ 8118B69F1D0A6FD600962084 /* FBSDKCoreKit.xcodeproj */, 8118B6AD1D0A6FDB00962084 /* FBSDKShareKit.xcodeproj */, 8118B6BB1D0A6FE300962084 /* FBSDKLoginKit.xcodeproj */, - 9D4D73501C19F30E001C505D /* Bolts.framework */, - 9D5FB1FD1C19EE06002F07BD /* Bolts.framework */, 9DAD79F81B7B244B00DFEF8F /* libOHHTTPStubs.a */, 9D18A8FA1A95981F00A41042 /* libOHHTTPStubs.a */, 9D1999E91A7AF7F100CAD112 /* UIKit.framework */, diff --git a/FBSDKIntegrationTests/FBSDKIntegrationTests.xcodeproj/xcshareddata/xcschemes/FBSDKIntegrationTests.xcscheme b/FBSDKIntegrationTests/FBSDKIntegrationTests.xcodeproj/xcshareddata/xcschemes/FBSDKIntegrationTests.xcscheme index 49abcfc97..ab717d468 100644 --- a/FBSDKIntegrationTests/FBSDKIntegrationTests.xcodeproj/xcshareddata/xcschemes/FBSDKIntegrationTests.xcscheme +++ b/FBSDKIntegrationTests/FBSDKIntegrationTests.xcodeproj/xcshareddata/xcschemes/FBSDKIntegrationTests.xcscheme @@ -6,20 +6,6 @@ parallelizeBuildables = "NO" buildImplicitDependencies = "YES"> - - - - + + + + diff --git a/FBSDKLoginKit.podspec b/FBSDKLoginKit.podspec index 5be725d8c..16b69a233 100644 --- a/FBSDKLoginKit.podspec +++ b/FBSDKLoginKit.podspec @@ -30,8 +30,6 @@ Pod::Spec.new do |s| s.requires_arc = true - # Allow the weak linking to Bolts (see FBSDKAppLinkResolver.h) in Cocoapods 0.39.0 - s.pod_target_xcconfig = { 'CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES' => 'YES' } s.dependency 'FBSDKCoreKit' s.ios.source_files = 'FBSDKLoginKit/FBSDKLoginKit/**/*.{h,m}' diff --git a/FBSDKPlacesKit.podspec b/FBSDKPlacesKit.podspec index 6df295b04..329620b0f 100644 --- a/FBSDKPlacesKit.podspec +++ b/FBSDKPlacesKit.podspec @@ -29,8 +29,6 @@ Pod::Spec.new do |s| s.source_files = 'FBSDKPlacesKit/FBSDKPlacesKit/**/*.{h,m}' s.public_header_files = 'FBSDKPlacesKit/FBSDKPlacesKit/*.{h}' - # Allow the weak linking to Bolts (see FBSDKAppLinkResolver.h) in Cocoapods 0.39.0 - s.pod_target_xcconfig = { 'CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES' => 'YES' } s.dependency 'FBSDKCoreKit' end diff --git a/FBSDKPlacesKit/FBSDKPlacesKit.xcodeproj/project.pbxproj b/FBSDKPlacesKit/FBSDKPlacesKit.xcodeproj/project.pbxproj index 769ed3720..a1dc6c500 100644 --- a/FBSDKPlacesKit/FBSDKPlacesKit.xcodeproj/project.pbxproj +++ b/FBSDKPlacesKit/FBSDKPlacesKit.xcodeproj/project.pbxproj @@ -138,7 +138,6 @@ 411C078C1E70BF660042959F /* FBSDKPlacesKitConstants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FBSDKPlacesKitConstants.h; sourceTree = ""; }; 412C1CA61E81BDBD00BBA19E /* CoreBluetooth.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreBluetooth.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.2.sdk/System/Library/Frameworks/CoreBluetooth.framework; sourceTree = DEVELOPER_DIR; }; 412C1CA91E81BDD200BBA19E /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.2.sdk/System/Library/Frameworks/CoreLocation.framework; sourceTree = DEVELOPER_DIR; }; - 4132FE5B1E60CD45006B7D46 /* Bolts.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Bolts.framework; path = "../../../../Library/Developer/Xcode/DerivedData/FBSDKPlacesKit-hjxvjfpzejznmsdpvzvyfvnmdddu/Build/Products/Debug-iphonesimulator/Bolts.framework"; sourceTree = ""; }; 4160212F1E799D9700700D96 /* FBSDKPlacesBluetoothScanner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FBSDKPlacesBluetoothScanner.h; sourceTree = ""; }; 416021301E799D9700700D96 /* FBSDKPlacesBluetoothScanner.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FBSDKPlacesBluetoothScanner.m; sourceTree = ""; }; 4164ED9E1E4BB02400C28D4C /* MapKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MapKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.2.sdk/System/Library/Frameworks/MapKit.framework; sourceTree = DEVELOPER_DIR; }; @@ -312,7 +311,6 @@ 0376AF5D1F202B5D0008A6AB /* CoreLocation.framework */, 412C1CA91E81BDD200BBA19E /* CoreLocation.framework */, 412C1CA61E81BDBD00BBA19E /* CoreBluetooth.framework */, - 4132FE5B1E60CD45006B7D46 /* Bolts.framework */, 419E37AB1E5CA9F200F9C7C5 /* SystemConfiguration.framework */, 4164ED9E1E4BB02400C28D4C /* MapKit.framework */, 8118B6781D0A5B9400962084 /* FBSDKCoreKit.xcodeproj */, diff --git a/FBSDKShareKit.podspec b/FBSDKShareKit.podspec index 5df724c6f..3c6ffb61a 100644 --- a/FBSDKShareKit.podspec +++ b/FBSDKShareKit.podspec @@ -31,8 +31,6 @@ Pod::Spec.new do |s| s.requires_arc = true s.header_dir = 'FBSDKShareKit' - # Allow the weak linking to Bolts (see FBSDKAppLinkResolver.h) in Cocoapods 0.39.0 - s.pod_target_xcconfig = { 'CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES' => 'YES' } s.dependency 'FBSDKCoreKit' s.public_header_files = 'FBSDKShareKit/FBSDKShareKit/*.{h}' diff --git a/FacebookSDK.podspec b/FacebookSDK.podspec index b3cee7e0d..34785c1b2 100644 --- a/FacebookSDK.podspec +++ b/FacebookSDK.podspec @@ -29,7 +29,6 @@ Pod::Spec.new do |s| s.requires_arc = true - s.dependency 'Bolts', '~> 1.9' s.default_subspecs = 'CoreKit', 'MarketingKit' s.subspec 'CoreKit' do |ss| diff --git a/FacebookSDK.xcworkspace/xcshareddata/FacebookSDK.xccheckout b/FacebookSDK.xcworkspace/xcshareddata/FacebookSDK.xccheckout index cc07a2823..3cd31dd7e 100644 --- a/FacebookSDK.xcworkspace/xcshareddata/FacebookSDK.xccheckout +++ b/FacebookSDK.xcworkspace/xcshareddata/FacebookSDK.xccheckout @@ -12,8 +12,6 @@ 38C2A0D4F62B675E8C16C8BC1437C7753846C8AC git://github.com/AliSoftware/OHHTTPStubs.git - 61C4B9E3B61282127C102C87B46B8CDE985974AE - git://github.com/BoltsFramework/Bolts-ObjC.git A20D666FF4B08EFE53F147818C2D4D17E2242912 ssh://projects.git.vip.facebook.com/data/gitrepos/ios-sdk DD20A1A48C66B5213E0FEBB87A95EF51D6C6F3E8 @@ -27,8 +25,6 @@ 38C2A0D4F62B675E8C16C8BC1437C7753846C8AC ../Carthage/Checkouts/OHHTTPStubs - 61C4B9E3B61282127C102C87B46B8CDE985974AE - ../Carthage/Checkouts/Bolts-ObjC A20D666FF4B08EFE53F147818C2D4D17E2242912 .. DD20A1A48C66B5213E0FEBB87A95EF51D6C6F3E8 @@ -52,14 +48,6 @@ IDESourceControlWCCName AFNetworking - - IDESourceControlRepositoryExtensionIdentifierKey - public.vcs.git - IDESourceControlWCCIdentifierKey - 61C4B9E3B61282127C102C87B46B8CDE985974AE - IDESourceControlWCCName - Bolts-ObjC - IDESourceControlRepositoryExtensionIdentifierKey public.vcs.git diff --git a/samples/Catalog/Catalog.xcodeproj/project.pbxproj b/samples/Catalog/Catalog.xcodeproj/project.pbxproj index ada4ebeb4..840cf8de0 100644 --- a/samples/Catalog/Catalog.xcodeproj/project.pbxproj +++ b/samples/Catalog/Catalog.xcodeproj/project.pbxproj @@ -26,7 +26,6 @@ 93DA31091BDE0BB200C9D5A1 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 93DA31081BDE0BB200C9D5A1 /* CoreGraphics.framework */; }; 93E4B5921C3B42E500A21170 /* FBSDKShareKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 93E4B58E1C3B42E500A21170 /* FBSDKShareKit.framework */; }; 93E4B5931C3B42E500A21170 /* FBSDKLoginKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 93E4B58F1C3B42E500A21170 /* FBSDKLoginKit.framework */; }; - 93E4B5941C3B42E500A21170 /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 93E4B5901C3B42E500A21170 /* Bolts.framework */; }; 93E4B5951C3B42E500A21170 /* FBSDKCoreKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 93E4B5911C3B42E500A21170 /* FBSDKCoreKit.framework */; }; 93E4B5971C3B464F00A21170 /* MobileCoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 93E4B5961C3B464F00A21170 /* MobileCoreServices.framework */; }; 93E4B5991C3B466D00A21170 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 93E4B5981C3B466D00A21170 /* UIKit.framework */; }; @@ -72,7 +71,6 @@ 93E4B57F1C3B406F00A21170 /* Project.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Project.xcconfig; path = ../Configurations/Project.xcconfig; sourceTree = ""; }; 93E4B58E1C3B42E500A21170 /* FBSDKShareKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FBSDKShareKit.framework; path = ../../../build/FBSDKShareKit.framework; sourceTree = ""; }; 93E4B58F1C3B42E500A21170 /* FBSDKLoginKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FBSDKLoginKit.framework; path = ../../../build/FBSDKLoginKit.framework; sourceTree = ""; }; - 93E4B5901C3B42E500A21170 /* Bolts.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Bolts.framework; path = ../../../build/Bolts.framework; sourceTree = ""; }; 93E4B5911C3B42E500A21170 /* FBSDKCoreKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FBSDKCoreKit.framework; path = ../../../build/FBSDKCoreKit.framework; sourceTree = ""; }; 93E4B5961C3B464F00A21170 /* MobileCoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MobileCoreServices.framework; path = System/Library/Frameworks/MobileCoreServices.framework; sourceTree = SDKROOT; }; 93E4B5981C3B466D00A21170 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; @@ -93,7 +91,6 @@ 93E4B5921C3B42E500A21170 /* FBSDKShareKit.framework in Frameworks */, 93DA31091BDE0BB200C9D5A1 /* CoreGraphics.framework in Frameworks */, 93E4B5931C3B42E500A21170 /* FBSDKLoginKit.framework in Frameworks */, - 93E4B5941C3B42E500A21170 /* Bolts.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -181,7 +178,6 @@ 93E4B5961C3B464F00A21170 /* MobileCoreServices.framework */, 93E4B58E1C3B42E500A21170 /* FBSDKShareKit.framework */, 93E4B58F1C3B42E500A21170 /* FBSDKLoginKit.framework */, - 93E4B5901C3B42E500A21170 /* Bolts.framework */, 93E4B5911C3B42E500A21170 /* FBSDKCoreKit.framework */, 93DA31081BDE0BB200C9D5A1 /* CoreGraphics.framework */, ); diff --git a/samples/Configurations/Project.xcconfig b/samples/Configurations/Project.xcconfig index a36cc4d16..2174945e7 100644 --- a/samples/Configurations/Project.xcconfig +++ b/samples/Configurations/Project.xcconfig @@ -33,7 +33,7 @@ INFOPLIST_FILE = $(TARGET_NAME)/$(TARGET_NAME)-Info.plist // Search Paths ALWAYS_SEARCH_USER_PATHS = NO -FRAMEWORK_SEARCH_PATHS = $(inherited) "$(SRCROOT)/../../build" "$(SRCROOT)/../../Carthage/Checkouts/Bolts-ObjC/build/ios" +FRAMEWORK_SEARCH_PATHS = $(inherited) "$(SRCROOT)/../../build" // Code Generation GCC_DYNAMIC_NO_PIC = NO diff --git a/samples/FBSDKPlacesSample/FBSDKPlacesSample.xcodeproj/project.pbxproj b/samples/FBSDKPlacesSample/FBSDKPlacesSample.xcodeproj/project.pbxproj index 65ab3c2f9..51fd56ba7 100755 --- a/samples/FBSDKPlacesSample/FBSDKPlacesSample.xcodeproj/project.pbxproj +++ b/samples/FBSDKPlacesSample/FBSDKPlacesSample.xcodeproj/project.pbxproj @@ -13,7 +13,6 @@ 41128B3F1E9EBC58007C0E88 /* Project.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 41128B3B1E9EBC58007C0E88 /* Project.xcconfig */; }; 4120F5F31E73752F006D9380 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 4120F5F11E73752F006D9380 /* Main.storyboard */; }; 4120F5F61E737535006D9380 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 4120F5F41E737535006D9380 /* LaunchScreen.storyboard */; }; - 412C1C9A1E81B97300BBA19E /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 412C1C951E81B97300BBA19E /* Bolts.framework */; }; 412C1C9B1E81B97300BBA19E /* FBSDKCoreKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 412C1C961E81B97300BBA19E /* FBSDKCoreKit.framework */; }; 412C1C9C1E81B97300BBA19E /* FBSDKLoginKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 412C1C971E81B97300BBA19E /* FBSDKLoginKit.framework */; }; 412C1C9D1E81B97300BBA19E /* FBSDKPlacesKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 412C1C981E81B97300BBA19E /* FBSDKPlacesKit.framework */; }; @@ -38,7 +37,6 @@ 4117F43C1E492495005F8991 /* FBSDKPlacesSample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = FBSDKPlacesSample.app; sourceTree = BUILT_PRODUCTS_DIR; }; 4120F5F21E73752F006D9380 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = FBSDKPlacesSample/Base.lproj/Main.storyboard; sourceTree = SOURCE_ROOT; }; 4120F5F51E737535006D9380 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = FBSDKPlacesSample/Base.lproj/LaunchScreen.storyboard; sourceTree = SOURCE_ROOT; }; - 412C1C951E81B97300BBA19E /* Bolts.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Bolts.framework; path = ../../build/Bolts.framework; sourceTree = ""; }; 412C1C961E81B97300BBA19E /* FBSDKCoreKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FBSDKCoreKit.framework; path = ../../build/FBSDKCoreKit.framework; sourceTree = ""; }; 412C1C971E81B97300BBA19E /* FBSDKLoginKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FBSDKLoginKit.framework; path = ../../build/FBSDKLoginKit.framework; sourceTree = ""; }; 412C1C981E81B97300BBA19E /* FBSDKPlacesKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FBSDKPlacesKit.framework; path = ../../build/FBSDKPlacesKit.framework; sourceTree = ""; }; @@ -67,7 +65,6 @@ buildActionMask = 2147483647; files = ( 41D778B41E9806E100590979 /* MapKit.framework in Frameworks */, - 412C1C9A1E81B97300BBA19E /* Bolts.framework in Frameworks */, 412C1C9B1E81B97300BBA19E /* FBSDKCoreKit.framework in Frameworks */, 412C1C9C1E81B97300BBA19E /* FBSDKLoginKit.framework in Frameworks */, 412C1C9D1E81B97300BBA19E /* FBSDKPlacesKit.framework in Frameworks */, @@ -137,7 +134,6 @@ isa = PBXGroup; children = ( 41D778B31E9806E100590979 /* MapKit.framework */, - 412C1C951E81B97300BBA19E /* Bolts.framework */, 412C1C961E81B97300BBA19E /* FBSDKCoreKit.framework */, 412C1C971E81B97300BBA19E /* FBSDKLoginKit.framework */, 412C1C981E81B97300BBA19E /* FBSDKPlacesKit.framework */, diff --git a/samples/Iconicus/Iconicus.xcodeproj/project.pbxproj b/samples/Iconicus/Iconicus.xcodeproj/project.pbxproj index 4e5519ac6..309a6552b 100644 --- a/samples/Iconicus/Iconicus.xcodeproj/project.pbxproj +++ b/samples/Iconicus/Iconicus.xcodeproj/project.pbxproj @@ -19,7 +19,6 @@ 89D558311AB8908900000502 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 89D5582F1AB8908900000502 /* Main.storyboard */; }; 89D558331AB8908900000502 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 89D558321AB8908900000502 /* Images.xcassets */; }; 89D558361AB8908900000502 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 89D558341AB8908900000502 /* LaunchScreen.xib */; }; - 89D558541AB8A1CC00000502 /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 89D558501AB8A1CC00000502 /* Bolts.framework */; }; 89D558551AB8A1CC00000502 /* FBSDKCoreKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 89D558511AB8A1CC00000502 /* FBSDKCoreKit.framework */; }; 89D558571AB8A1CC00000502 /* FBSDKShareKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 89D558531AB8A1CC00000502 /* FBSDKShareKit.framework */; }; 89D558631AB8A2B600000502 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 89D558621AB8A2B600000502 /* UIKit.framework */; }; @@ -52,7 +51,6 @@ 89D558301AB8908900000502 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; 89D558321AB8908900000502 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = ""; }; 89D558351AB8908900000502 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = ""; }; - 89D558501AB8A1CC00000502 /* Bolts.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Bolts.framework; path = ../../build/Bolts.framework; sourceTree = SOURCE_ROOT; }; 89D558511AB8A1CC00000502 /* FBSDKCoreKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FBSDKCoreKit.framework; path = ../../build/FBSDKCoreKit.framework; sourceTree = SOURCE_ROOT; }; 89D558531AB8A1CC00000502 /* FBSDKShareKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FBSDKShareKit.framework; path = ../../build/FBSDKShareKit.framework; sourceTree = SOURCE_ROOT; }; 89D558591AB8A22200000502 /* Application.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Application.xcconfig; path = ../Configurations/Application.xcconfig; sourceTree = ""; }; @@ -75,7 +73,6 @@ 89D558671AB8A2C200000502 /* CoreGraphics.framework in Frameworks */, 89D558651AB8A2BC00000502 /* Foundation.framework in Frameworks */, 89D558631AB8A2B600000502 /* UIKit.framework in Frameworks */, - 89D558541AB8A1CC00000502 /* Bolts.framework in Frameworks */, 89D558551AB8A1CC00000502 /* FBSDKCoreKit.framework in Frameworks */, 89D558571AB8A1CC00000502 /* FBSDKShareKit.framework in Frameworks */, ); @@ -144,7 +141,6 @@ 89D5584F1AB8A1B100000502 /* Frameworks */ = { isa = PBXGroup; children = ( - 89D558501AB8A1CC00000502 /* Bolts.framework */, 89D558661AB8A2C200000502 /* CoreGraphics.framework */, 89D558511AB8A1CC00000502 /* FBSDKCoreKit.framework */, 89D558531AB8A1CC00000502 /* FBSDKShareKit.framework */, diff --git a/samples/Iconicus/Iconicus/GameViewController.m b/samples/Iconicus/Iconicus/GameViewController.m index 06d929e85..7c824722b 100644 --- a/samples/Iconicus/Iconicus/GameViewController.m +++ b/samples/Iconicus/Iconicus/GameViewController.m @@ -63,7 +63,7 @@ - (BOOL)loadGameFromAppLinkURL:(BFURL *)appLinkURL } // only show the back to referer navigation-banner when refererURL is set. - // In this version of Bolts, we will need to change the size of this view frame manually to none-zero. + // In this version of FBSDKCoreKit, we will need to change the size of this view frame manually to none-zero. _returnToRefererController.view = self.returnToRefererView; [_returnToRefererController showViewForRefererAppLink:appLinkURL.appLinkReferer]; } diff --git a/samples/RPSSample/RPSSample.xcodeproj/project.pbxproj b/samples/RPSSample/RPSSample.xcodeproj/project.pbxproj index 983945137..75e5198fb 100644 --- a/samples/RPSSample/RPSSample.xcodeproj/project.pbxproj +++ b/samples/RPSSample/RPSSample.xcodeproj/project.pbxproj @@ -42,7 +42,6 @@ 85C69D741602B098008AD9A0 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 85C69D711602B098008AD9A0 /* Default-568h@2x.png */; }; 85C69D751602B098008AD9A0 /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 85C69D721602B098008AD9A0 /* Default.png */; }; 85C69D761602B098008AD9A0 /* Default@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 85C69D731602B098008AD9A0 /* Default@2x.png */; }; - 9D7073461AA8D194000230AC /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9D70729A1AA8D193000230AC /* Bolts.framework */; }; DB8278D01AAFB72E004247DA /* RPSFriendsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = DB8278CF1AAFB72E004247DA /* RPSFriendsViewController.m */; }; DBCEEA4E1A95439C00D2C8AE /* FBSDKCoreKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DBCEEA4B1A95439C00D2C8AE /* FBSDKCoreKit.framework */; }; DBCEEA4F1A95439C00D2C8AE /* FBSDKLoginKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DBCEEA4C1A95439C00D2C8AE /* FBSDKLoginKit.framework */; }; @@ -96,7 +95,6 @@ 8986C7F01890A571004B90DD /* Project-Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "Project-Debug.xcconfig"; sourceTree = ""; }; 8986C7F11890A571004B90DD /* Project-Release.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "Project-Release.xcconfig"; sourceTree = ""; }; 8986C7F21890A571004B90DD /* Project.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Project.xcconfig; sourceTree = ""; }; - 9D70729A1AA8D193000230AC /* Bolts.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Bolts.framework; path = ../../build/Bolts.framework; sourceTree = ""; }; 9D9ACC431ABFBD9B0050BF2E /* ReadMe.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = ReadMe.txt; sourceTree = ""; }; DB8278CE1AAFB715004247DA /* RPSFriendsViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RPSFriendsViewController.h; sourceTree = ""; }; DB8278CF1AAFB72E004247DA /* RPSFriendsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RPSFriendsViewController.m; sourceTree = ""; }; @@ -117,7 +115,6 @@ 84070D1B1540AA2B00E39703 /* UIKit.framework in Frameworks */, 84070D1D1540AA2B00E39703 /* Foundation.framework in Frameworks */, 84070D1F1540AA2B00E39703 /* CoreGraphics.framework in Frameworks */, - 9D7073461AA8D194000230AC /* Bolts.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -149,7 +146,6 @@ isa = PBXGroup; children = ( 84EB807017033179007561AE /* AVFoundation.framework */, - 9D70729A1AA8D193000230AC /* Bolts.framework */, 84070D1E1540AA2B00E39703 /* CoreGraphics.framework */, DBCEEA4B1A95439C00D2C8AE /* FBSDKCoreKit.framework */, DBCEEA4C1A95439C00D2C8AE /* FBSDKLoginKit.framework */, diff --git a/scripts/build_distribution.sh b/scripts/build_distribution.sh index ea6381c99..4d568c6fe 100755 --- a/scripts/build_distribution.sh +++ b/scripts/build_distribution.sh @@ -295,8 +295,6 @@ else || die "Could not copy FBSDKShareKit.framework" \cp -R "$FB_SDK_BUILD"/FBSDKPlacesKit.framework "$FB_SDK_BUILD_PACKAGE" \ || die "Could not copy FBSDKPlacesKit.framework" - \cp -R "$FB_SDK_BUILD"/Bolts.framework "$FB_SDK_BUILD_PACKAGE" \ - || die "Could not copy Bolts.framework" \cp -R $"$FB_SDK_ROOT"/FacebookSDKStrings.bundle "$FB_SDK_BUILD_PACKAGE" \ || die "Could not copy FacebookSDKStrings.bundle" for SAMPLE in Configurations Iconicus RPSSample Scrumptious ShareIt SwitchUserSample FBSDKPlacesSample; do @@ -310,7 +308,7 @@ else # Fixup projects to point to the SDK framework for fname in $(find "$FB_SDK_BUILD_PACKAGE_SAMPLES" -name "Project.xcconfig" -print); do \ - sed 's|\(\.\.\(/\.\.\)*\)/build|\1|g;s|\.\.\(/\.\.\)*/Carthage/Checkouts/Bolts-ObjC/build/ios||g' \ + sed 's|\(\.\.\(/\.\.\)*\)/build|\1|g;s|\.\.\(/\.\.\)*/Carthage/Checkouts/build/ios||g' \ ${fname} > ${fname}.tmpfile && mv ${fname}.tmpfile ${fname}; \ done for fname in $(find "$FB_SDK_BUILD_PACKAGE_SAMPLES" -name "project.pbxproj" -print); do \