Skip to content

Commit

Permalink
Facebook iOS SDK 4.15.1
Browse files Browse the repository at this point in the history
  • Loading branch information
chrisp-fb committed Sep 9, 2016
2 parents 07dd590 + 3a7d5f0 commit 4b4bd95
Show file tree
Hide file tree
Showing 34 changed files with 147 additions and 357 deletions.
1 change: 1 addition & 0 deletions Configurations/FacebookSDK-DynamicFramework.xcconfig
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ CODE_SIGNING_REQUIRED = NO
// Required for dynamic frameworks to properly emit bitcode
ENABLE_BITCODE = YES
FB_BITCODE_FLAG[sdk=iphoneos9.*] =
FB_BITCODE_FLAG[sdk=iphoneos10.*] =

// Whether to strip out code that isn't called from anywhere
DEAD_CODE_STRIPPING = NO
Expand Down
1 change: 1 addition & 0 deletions Configurations/FacebookSDK-Project.xcconfig
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ ENABLE_BITCODE = NO
FB_BITCODE_FLAG = $()
// Only specify bitcode for iphoneos. Specifying iphonesimulator breaks Xcode6
FB_BITCODE_FLAG[sdk=iphoneos9.*] = -fembed-bitcode
FB_BITCODE_FLAG[sdk=iphoneos10.*] = -fembed-bitcode
OTHER_CFLAGS = $(inherited) $(FB_BITCODE_FLAG)

// Warnings
Expand Down
1 change: 1 addition & 0 deletions Configurations/Platform/iOS.xcconfig
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,5 @@ ENABLE_BITCODE = NO
FB_BITCODE_FLAG = $()
// Only specify bitcode for iphoneos. Specifying iphonesimulator breaks Xcode 6
FB_BITCODE_FLAG[sdk=iphoneos9.*] = -fembed-bitcode
FB_BITCODE_FLAG[sdk=iphoneos10.*] = -fembed-bitcode
OTHER_CFLAGS = $(inherited) $(FB_BITCODE_FLAG)
1 change: 1 addition & 0 deletions Configurations/Target/DynamicFramework.xcconfig
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ CODE_SIGN_IDENTITY =
// Required for dynamic frameworks to properly emit bitcode
ENABLE_BITCODE = YES
FB_BITCODE_FLAG[sdk=iphoneos9.*] =
FB_BITCODE_FLAG[sdk=iphoneos10.*] =

// Enables the framework to be included from any location as long as the
// loader’s runpath search paths includes it. For example from an application
Expand Down
2 changes: 1 addition & 1 deletion Configurations/Version.xcconfig
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@
// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

// The versions for FBSDK and Messenger SDK.
FBSDK_PROJECT_VERSION=4.15.0
FBSDK_PROJECT_VERSION=4.15.1
MNSDK_PROJECT_VERSION=TODO_SUPPORT_MNSDK

4 changes: 2 additions & 2 deletions FBSDKCoreKit.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Pod::Spec.new do |s|

s.name = "FBSDKCoreKit"
s.version = "4.15.0"
s.version = "4.15.1"
s.summary = "Official Facebook SDK for iOS to access Facebook Platform's core features"

s.description = <<-DESC
Expand All @@ -22,7 +22,7 @@ Pod::Spec.new do |s|
s.tvos.deployment_target = '9.0'

s.source = { :git => "https://github.com/facebook/facebook-ios-sdk.git",
:tag => "sdk-version-4.15.0"
:tag => "sdk-version-4.15.1"
}

s.ios.weak_frameworks = 'Accounts', 'CoreLocation', 'Social', 'Security', 'QuartzCore', 'CoreGraphics', 'UIKit', 'Foundation', 'AudioToolbox'
Expand Down
12 changes: 0 additions & 12 deletions FBSDKCoreKit/FBSDKCoreKit.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,6 @@
81B71D1F1D19C87400933E93 /* FBSDKError.m in Sources */ = {isa = PBXBuildFile; fileRef = 894C0B601A7150AC009137EF /* FBSDKError.m */; };
81B71D201D19C87400933E93 /* FBSDKAccessTokenCacheV3_21.m in Sources */ = {isa = PBXBuildFile; fileRef = 9DE1F3C81A89CEE600B54D98 /* FBSDKAccessTokenCacheV3_21.m */; };
81B71D211D19C87400933E93 /* FBSDKTypeUtility.m in Sources */ = {isa = PBXBuildFile; fileRef = 894C0B6F1A717D60009137EF /* FBSDKTypeUtility.m */; };
81B71D221D19C87400933E93 /* FBSDKOrganicDeeplinkHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D69EFDF1CAC74FE00CF5A73 /* FBSDKOrganicDeeplinkHelper.m */; };
81B71D231D19C87400933E93 /* FBSDKAudioResourceLoader.m in Sources */ = {isa = PBXBuildFile; fileRef = 89D05AA81AA1134000609300 /* FBSDKAudioResourceLoader.m */; };
81B71D241D19C87400933E93 /* FBSDKLogo.m in Sources */ = {isa = PBXBuildFile; fileRef = 893F44941A6444DF001DB0B6 /* FBSDKLogo.m */; };
81B71D251D19C87400933E93 /* FBSDKPaymentObserver.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D0BC14B1A8D236200BE8BA4 /* FBSDKPaymentObserver.m */; };
Expand Down Expand Up @@ -300,7 +299,6 @@
81B71D8C1D19C87400933E93 /* FBSDKGraphRequestBody.h in Headers */ = {isa = PBXBuildFile; fileRef = 9DC658A01A6EE7E200B85AAF /* FBSDKGraphRequestBody.h */; };
81B71D8D1D19C87400933E93 /* FBSDKGraphRequestDataAttachment.h in Headers */ = {isa = PBXBuildFile; fileRef = 896DE2321A9E509300195731 /* FBSDKGraphRequestDataAttachment.h */; settings = {ATTRIBUTES = (Public, ); }; };
81B71D8E1D19C87400933E93 /* FBSDKAccessTokenCacheV3.h in Headers */ = {isa = PBXBuildFile; fileRef = 9DE1F3BF1A89C57A00B54D98 /* FBSDKAccessTokenCacheV3.h */; };
81B71D8F1D19C87400933E93 /* FBSDKOrganicDeeplinkHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = 9D69EFDE1CAC74FE00CF5A73 /* FBSDKOrganicDeeplinkHelper.h */; };
81B71D901D19C87400933E93 /* FBSDKSettings.h in Headers */ = {isa = PBXBuildFile; fileRef = 9DA8303A1A6999EC00770955 /* FBSDKSettings.h */; settings = {ATTRIBUTES = (Public, ); }; };
81B71D911D19C87400933E93 /* FBSDKServerConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = 89830F2D1A7805E100226ABB /* FBSDKServerConfiguration.h */; };
81B71D921D19C87400933E93 /* FBSDKAppEventsStateManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 9D0BC15D1A8D428700BE8BA4 /* FBSDKAppEventsStateManager.h */; };
Expand Down Expand Up @@ -451,8 +449,6 @@
9D6538411BF44FB4008A08E9 /* FBSDKViewImpressionTracker.m in Sources */ = {isa = PBXBuildFile; fileRef = 89688B611AA64C5E00A98519 /* FBSDKViewImpressionTracker.m */; };
9D6999FE1A76E166003AE384 /* FBSDKLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = 9D6999FC1A76E166003AE384 /* FBSDKLogger.h */; };
9D6999FF1A76E166003AE384 /* FBSDKLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D6999FD1A76E166003AE384 /* FBSDKLogger.m */; };
9D69EFE01CAC74FE00CF5A73 /* FBSDKOrganicDeeplinkHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = 9D69EFDE1CAC74FE00CF5A73 /* FBSDKOrganicDeeplinkHelper.h */; };
9D69EFE11CAC74FE00CF5A73 /* FBSDKOrganicDeeplinkHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D69EFDF1CAC74FE00CF5A73 /* FBSDKOrganicDeeplinkHelper.m */; };
9D69FC4F1AA66BBF0068EC76 /* FBSDKGraphRequestConnection+Internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 9D69FC421AA66BBC0068EC76 /* FBSDKGraphRequestConnection+Internal.h */; };
9D6DEEA91BC2368D001A94ED /* FBSDKAppEvents.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D0BC1561A8D23E200BE8BA4 /* FBSDKAppEvents.m */; };
9D6DEEAA1BC236B9001A94ED /* FBSDKAccessToken.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D3029091A65C4420086B9ED /* FBSDKAccessToken.m */; };
Expand Down Expand Up @@ -984,8 +980,6 @@
9D641F8B1A7E0EA10048F563 /* FBSDKURLOpening.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FBSDKURLOpening.h; sourceTree = "<group>"; };
9D6999FC1A76E166003AE384 /* FBSDKLogger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FBSDKLogger.h; sourceTree = "<group>"; };
9D6999FD1A76E166003AE384 /* FBSDKLogger.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FBSDKLogger.m; sourceTree = "<group>"; };
9D69EFDE1CAC74FE00CF5A73 /* FBSDKOrganicDeeplinkHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FBSDKOrganicDeeplinkHelper.h; path = AppLink/FBSDKOrganicDeeplinkHelper.h; sourceTree = "<group>"; };
9D69EFDF1CAC74FE00CF5A73 /* FBSDKOrganicDeeplinkHelper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FBSDKOrganicDeeplinkHelper.m; path = AppLink/FBSDKOrganicDeeplinkHelper.m; sourceTree = "<group>"; };
9D69FC421AA66BBC0068EC76 /* FBSDKGraphRequestConnection+Internal.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "FBSDKGraphRequestConnection+Internal.h"; sourceTree = "<group>"; };
9D7E7E5F1ADF038800F53E38 /* FBSDKTestUsersManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FBSDKTestUsersManager.h; sourceTree = "<group>"; };
9D7E7E601ADF038800F53E38 /* FBSDKTestUsersManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FBSDKTestUsersManager.m; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1141,8 +1135,6 @@
7EB63D901A9BE720003A7AED /* AppLink */ = {
isa = PBXGroup;
children = (
9D69EFDE1CAC74FE00CF5A73 /* FBSDKOrganicDeeplinkHelper.h */,
9D69EFDF1CAC74FE00CF5A73 /* FBSDKOrganicDeeplinkHelper.m */,
7EB63D9E1A9BE730003A7AED /* FBSDKBoltsMeasurementEventListener.h */,
7EB63D9D1A9BE730003A7AED /* FBSDKBoltsMeasurementEventListener.m */,
);
Expand Down Expand Up @@ -1791,7 +1783,6 @@
81B71D8C1D19C87400933E93 /* FBSDKGraphRequestBody.h in Headers */,
81B71D8D1D19C87400933E93 /* FBSDKGraphRequestDataAttachment.h in Headers */,
81B71D8E1D19C87400933E93 /* FBSDKAccessTokenCacheV3.h in Headers */,
81B71D8F1D19C87400933E93 /* FBSDKOrganicDeeplinkHelper.h in Headers */,
81B71D901D19C87400933E93 /* FBSDKSettings.h in Headers */,
81B71D911D19C87400933E93 /* FBSDKServerConfiguration.h in Headers */,
81B71D921D19C87400933E93 /* FBSDKAppEventsStateManager.h in Headers */,
Expand Down Expand Up @@ -1886,7 +1877,6 @@
9DC658A51A6EE7E200B85AAF /* FBSDKGraphRequestBody.h in Headers */,
896DE2341A9E509300195731 /* FBSDKGraphRequestDataAttachment.h in Headers */,
9DE1F3C11A89C57A00B54D98 /* FBSDKAccessTokenCacheV3.h in Headers */,
9D69EFE01CAC74FE00CF5A73 /* FBSDKOrganicDeeplinkHelper.h in Headers */,
9DA8303C1A6999EC00770955 /* FBSDKSettings.h in Headers */,
89830F2F1A7805E100226ABB /* FBSDKServerConfiguration.h in Headers */,
9D0BC15F1A8D428700BE8BA4 /* FBSDKAppEventsStateManager.h in Headers */,
Expand Down Expand Up @@ -2470,7 +2460,6 @@
81B71D1F1D19C87400933E93 /* FBSDKError.m in Sources */,
81B71D201D19C87400933E93 /* FBSDKAccessTokenCacheV3_21.m in Sources */,
81B71D211D19C87400933E93 /* FBSDKTypeUtility.m in Sources */,
81B71D221D19C87400933E93 /* FBSDKOrganicDeeplinkHelper.m in Sources */,
81B71D231D19C87400933E93 /* FBSDKAudioResourceLoader.m in Sources */,
81B71D241D19C87400933E93 /* FBSDKLogo.m in Sources */,
81B71D251D19C87400933E93 /* FBSDKPaymentObserver.m in Sources */,
Expand Down Expand Up @@ -2547,7 +2536,6 @@
894C0B621A7150AC009137EF /* FBSDKError.m in Sources */,
9DE1F3CA1A89CEE600B54D98 /* FBSDKAccessTokenCacheV3_21.m in Sources */,
894C0B711A717D60009137EF /* FBSDKTypeUtility.m in Sources */,
9D69EFE11CAC74FE00CF5A73 /* FBSDKOrganicDeeplinkHelper.m in Sources */,
89D05AAA1AA1134000609300 /* FBSDKAudioResourceLoader.m in Sources */,
893F449A1A6444DF001DB0B6 /* FBSDKLogo.m in Sources */,
9D0BC1501A8D236200BE8BA4 /* FBSDKPaymentObserver.m in Sources */,
Expand Down
20 changes: 3 additions & 17 deletions FBSDKCoreKit/FBSDKCoreKit/FBSDKAppLinkUtility.h
Original file line number Diff line number Diff line change
Expand Up @@ -61,24 +61,10 @@ typedef void (^FBSDKDeferredAppInviteHandler)(NSURL *url);
+ (void)fetchDeferredAppLink:(FBSDKDeferredAppLinkHandler)handler;

/*!
@abstract Call this method from the main thread to fetch deferred deeplink for App Invites
Handler is called with deeplink url, if found, nil otherwise.
@param handler Handler to be called when we fetch deeplink url.
@return YES if async fetch process was started, NO if it failed to start. Note it returns NO
for versions < iOS 9.
@discussion Call this method from the main thread to fetch deferred deeplink if you use App Invites.
This may require a network round trip. If successful, this will call the handler provided, with
deferred deeplink that was clicked by the user. If there is a error/timeout, handler will be called
with nil.
This method only works on iOS 9+ and returns NO otherwise.
This method should only be called from a location that occurs after any launching URL has
been processed (e.g., you should call this method from your application delegate's
didFinishLaunchingWithOptions:).
@deprecated This method is no longer available and will always return NO.
*/
+ (BOOL)fetchDeferredAppInvite:(FBSDKDeferredAppInviteHandler)handler;
+ (BOOL)fetchDeferredAppInvite:(FBSDKDeferredAppInviteHandler)handler
__attribute__((deprecated("This method is no longer available.")));;

/*
@abstract Call this method to fetch promotion code from the url, if it's present. This function
Expand Down
8 changes: 1 addition & 7 deletions FBSDKCoreKit/FBSDKCoreKit/FBSDKAppLinkUtility.m
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
#import "FBSDKAppEventsUtility.h"
#import "FBSDKGraphRequest.h"
#import "FBSDKInternalUtility.h"
#import "FBSDKOrganicDeeplinkHelper.h"
#import "FBSDKSettings.h"
#import "FBSDKUtility.h"

Expand Down Expand Up @@ -83,12 +82,7 @@ + (void)fetchDeferredAppLink:(FBSDKDeferredAppLinkHandler)handler

+ (BOOL)fetchDeferredAppInvite:(FBSDKDeferredAppInviteHandler)handler
{
NSAssert([NSThread isMainThread], @"FBSDKAppLink fetchOrganicDeferredAppLink: must be invoked from main thread.");

NSAssert(handler, @"FBSDKAppLink fetchOrganicDeferredAppLink: must be invoked with valid handler.");

FBSDKOrganicDeeplinkHelper *deeplinkHelper = [[FBSDKOrganicDeeplinkHelper alloc] init];
return [deeplinkHelper fetchOrganicDeeplink:handler];
return NO;
}

+ (NSString*)appInvitePromotionCodeFromURL:(NSURL*)url;
Expand Down
29 changes: 0 additions & 29 deletions FBSDKCoreKit/FBSDKCoreKit/FBSDKApplicationDelegate.m
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
#import "FBSDKBridgeAPIResponse.h"
#import "FBSDKContainerViewController.h"
#import "FBSDKProfile+Internal.h"
#import "FBSDKOrganicDeeplinkHelper.h"
#endif

NSString *const FBSDKApplicationDidBecomeActiveNotification = @"com.facebook.sdk.FBSDKApplicationDidBecomeActiveNotification";
Expand Down Expand Up @@ -136,34 +135,6 @@ - (BOOL)application:(UIApplication *)application
[FBSDKTimeSpentData setSourceApplication:sourceApplication openURL:url];

#if !TARGET_OS_TV
if (_organicDeeplinkHandler) {
NSDictionary *params = [FBSDKUtility dictionaryWithQueryString:url.query];
if([params[@"fbsdk_deeplink"] isEqualToString: @"1"]) {

NSURL *sanitizedUrl = nil;

if(![params[@"fbsdk_deeplink_exception"] isEqualToString:@"1"]) {

NSMutableDictionary *sanitizedParams = [NSMutableDictionary dictionaryWithDictionary:params];
[sanitizedParams removeObjectForKey:@"fbsdk_deeplink"];
sanitizedUrl = [FBSDKInternalUtility URLWithScheme:url.scheme
host:url.host
path:url.path
queryParameters:sanitizedParams
error:nil];
}
// copy the _organicDeeplinkHandler here because it can get cleared in FBSDKOrganicDeeplinkHelper
// so that we avoid bad_exc_access in the dispatch_async below.
FBSDKDeferredAppInviteHandler appInviteHandler = [_organicDeeplinkHandler copy];
_organicDeeplinkHandler = nil;
dispatch_async(dispatch_get_main_queue(), ^{
appInviteHandler(sanitizedUrl);
});

return YES;
}
}

// if they completed a SFVC flow, dismiss it.
[_safariViewController.presentingViewController dismissViewControllerAnimated:YES completion: nil];
_safariViewController = nil;
Expand Down
2 changes: 1 addition & 1 deletion FBSDKCoreKit/FBSDKCoreKit/FBSDKCoreKit.h
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,5 @@
#import <FBSDKCoreKit/FBSDKDeviceViewControllerBase.h>
#endif

#define FBSDK_VERSION_STRING @"4.15.0"
#define FBSDK_VERSION_STRING @"4.15.1"
#define FBSDK_TARGET_PLATFORM_VERSION @"v2.7"

This file was deleted.

Loading

2 comments on commit 4b4bd95

@derjohng
Copy link

@derjohng derjohng commented on 4b4bd95 Sep 15, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi, I can not find "issue" tab for reporting. So, I write here. Hope this is suitable.
4.15.1 will cause below error while I try to archive binary on Xcode7.3.1.

error: Invalid bitcodee version (Producer: '800.0.38.0_0' Reader: '703.0.31_0')

If I change back to 4.15.0, then the error gone and archive done.

pod 'FBSDKCoreKit', '=4.15.0'

@mingflifb
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't have an open issues tab, bugs should go to developers.facebook.com/bugs.

4.15.1 is an update to 4.15.0 for XCode 8 GM and iOS 10, see our changelogs here: https://developers.facebook.com/docs/ios/change-log-4.x/

Please sign in to comment.