mirror of
https://github.com/zhigang1992/facebook-ios-sdk.git
synced 2026-04-30 02:16:16 +08:00
Facebook iOS SDK 4.32
This commit is contained in:
3
.gitignore
vendored
3
.gitignore
vendored
@@ -8,6 +8,9 @@ ads/samples/NativeAdSample/NativeAdSample.xcworkspace/*
|
||||
ads/internal/samples/Hackvertising/Hackvertising.xcodeproj/*
|
||||
ads/internal/samples/Hackvertising/Hackvertising.xcworkspace/*
|
||||
|
||||
ads/ancamp/ANCampApp/ANCampApp.xcodeproj/*
|
||||
ads/ancamp/ANCampApp/ANCampApp.xcworkspace/*
|
||||
|
||||
ads/src/FBAudienceNetwork.xcworkspace/*
|
||||
ads/src/FBAudienceNetwork/FBAudienceNetworkWorkspace.xcworkspace/*
|
||||
ads/src/FBAudienceNetwork/FBAudienceNetwork.xcodeproj/*
|
||||
|
||||
Submodule Bolts-IOS updated: 4dc65427dd...68a906ea8a
@@ -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.31.1
|
||||
FBSDK_PROJECT_VERSION=4.32.0
|
||||
MNSDK_PROJECT_VERSION=TODO_SUPPORT_MNSDK
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
Pod::Spec.new do |s|
|
||||
|
||||
s.name = "FBSDKCoreKit"
|
||||
s.version = "4.31.1"
|
||||
s.version = "4.32.0"
|
||||
s.summary = "Official Facebook SDK for iOS to access Facebook Platform's core features"
|
||||
|
||||
s.description = <<-DESC
|
||||
@@ -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.31.1"
|
||||
:tag => "sdk-version-4.32.0"
|
||||
}
|
||||
|
||||
s.ios.weak_frameworks = 'Accounts', 'CoreLocation', 'Social', 'Security', 'QuartzCore', 'CoreGraphics', 'UIKit', 'Foundation', 'AudioToolbox'
|
||||
|
||||
@@ -122,6 +122,7 @@ NSString *const FBSDKAppEventNameFBSDKLikeButtonImpression = @"fb_like_bu
|
||||
NSString *const FBSDKAppEventNameFBSDKLoginButtonImpression = @"fb_login_button_impression";
|
||||
NSString *const FBSDKAppEventNameFBSDKSendButtonImpression = @"fb_send_button_impression";
|
||||
NSString *const FBSDKAppEventNameFBSDKShareButtonImpression = @"fb_share_button_impression";
|
||||
NSString *const FBSDKAppEventNameFBSDKLiveStreamingButtonImpression = @"fb_live_streaming_button_impression";
|
||||
|
||||
NSString *const FBSDKAppEventNameFBSDKSmartLoginService = @"fb_smart_login_service";
|
||||
|
||||
@@ -129,6 +130,7 @@ NSString *const FBSDKAppEventNameFBSDKLikeButtonDidTap = @"fb_like_button_did_t
|
||||
NSString *const FBSDKAppEventNameFBSDKLoginButtonDidTap = @"fb_login_button_did_tap";
|
||||
NSString *const FBSDKAppEventNameFBSDKSendButtonDidTap = @"fb_send_button_did_tap";
|
||||
NSString *const FBSDKAppEventNameFBSDKShareButtonDidTap = @"fb_share_button_did_tap";
|
||||
NSString *const FBSDKAppEventNameFBSDKLiveStreamingButtonDidTap = @"fb_live_streaming_button_did_tap";
|
||||
|
||||
NSString *const FBSDKAppEventNameFBSDKLikeControlDidDisable = @"fb_like_control_did_disable";
|
||||
NSString *const FBSDKAppEventNameFBSDKLikeControlDidLike = @"fb_like_control_did_like";
|
||||
@@ -149,6 +151,16 @@ NSString *const FBSDKAppEventNameFBSDKEventAppInviteShareDialogShow = @"fb_app
|
||||
|
||||
NSString *const FBSDKAppEventNameFBSessionFASLoginDialogResult = @"fb_mobile_login_fas_dialog_result";
|
||||
|
||||
NSString *const FBSDKAppEventNameFBSDKLiveStreamingStart = @"fb_sdk_live_streaming_start";
|
||||
NSString *const FBSDKAppEventNameFBSDKLiveStreamingStop = @"fb_sdk_live_streaming_stop";
|
||||
NSString *const FBSDKAppEventNameFBSDKLiveStreamingPause = @"fb_sdk_live_streaming_pause";
|
||||
NSString *const FBSDKAppEventNameFBSDKLiveStreamingResume = @"fb_sdk_live_streaming_resume";
|
||||
NSString *const FBSDKAppEventNameFBSDKLiveStreamingError = @"fb_sdk_live_streaming_error";
|
||||
NSString *const FBSDKAppEventNameFBSDKLiveStreamingUpdateStatus = @"fb_sdk_live_streaming_update_status";
|
||||
NSString *const FBSDKAppEventNameFBSDKLiveStreamingVideoID = @"fb_sdk_live_streaming_video_id";
|
||||
NSString *const FBSDKAppEventNameFBSDKLiveStreamingMic = @"fb_sdk_live_streaming_mic";
|
||||
NSString *const FBSDKAppEventNameFBSDKLiveStreamingCamera = @"fb_sdk_live_streaming_camera";
|
||||
|
||||
// Event Parameters internal to this file
|
||||
NSString *const FBSDKAppEventParameterDialogOutcome = @"fb_dialog_outcome";
|
||||
NSString *const FBSDKAppEventParameterDialogErrorMessage = @"fb_dialog_outcome_error_message";
|
||||
@@ -162,6 +174,13 @@ NSString *const FBSDKAppEventParameterLogTime = @"_logTime";
|
||||
NSString *const FBSDKAppEventParameterEventName = @"_eventName";
|
||||
NSString *const FBSDKAppEventParameterImplicitlyLogged = @"_implicitlyLogged";
|
||||
|
||||
NSString *const FBSDKAppEventParameterLiveStreamingPrevStatus = @"live_streaming_prev_status";
|
||||
NSString *const FBSDKAppEventParameterLiveStreamingStatus = @"live_streaming_status";
|
||||
NSString *const FBSDKAppEventParameterLiveStreamingError = @"live_streaming_error";
|
||||
NSString *const FBSDKAppEventParameterLiveStreamingVideoID = @"live_streaming_video_id";
|
||||
NSString *const FBSDKAppEventParameterLiveStreamingMicEnabled = @"live_streaming_mic_enabled";
|
||||
NSString *const FBSDKAppEventParameterLiveStreamingCameraEnabled = @"live_streaming_camera_enabled";
|
||||
|
||||
// Event parameter values internal to this file
|
||||
NSString *const FBSDKAppEventsDialogOutcomeValue_Completed = @"Completed";
|
||||
NSString *const FBSDKAppEventsDialogOutcomeValue_Cancelled = @"Cancelled";
|
||||
|
||||
@@ -44,5 +44,5 @@
|
||||
#import <FBSDKCoreKit/FBSDKDeviceViewControllerBase.h>
|
||||
#endif
|
||||
|
||||
#define FBSDK_VERSION_STRING @"4.31.1"
|
||||
#define FBSDK_VERSION_STRING @"4.32.0"
|
||||
#define FBSDK_TARGET_PLATFORM_VERSION @"v2.11"
|
||||
|
||||
@@ -94,6 +94,17 @@ FBSDK_EXTERN NSString *const FBSDKAppEventNameFBDialogsWebLoginCompleted;
|
||||
/** Use to log the result of the App Switch OS AlertView. Only available on OS >= iOS10 */
|
||||
FBSDK_EXTERN NSString *const FBSDKAppEventNameFBSessionFASLoginDialogResult;
|
||||
|
||||
/** Use to log the live streaming events from sdk */
|
||||
FBSDK_EXTERN NSString *const FBSDKAppEventNameFBSDKLiveStreamingStart;
|
||||
FBSDK_EXTERN NSString *const FBSDKAppEventNameFBSDKLiveStreamingStop;
|
||||
FBSDK_EXTERN NSString *const FBSDKAppEventNameFBSDKLiveStreamingPause;
|
||||
FBSDK_EXTERN NSString *const FBSDKAppEventNameFBSDKLiveStreamingResume;
|
||||
FBSDK_EXTERN NSString *const FBSDKAppEventNameFBSDKLiveStreamingError;
|
||||
FBSDK_EXTERN NSString *const FBSDKAppEventNameFBSDKLiveStreamingUpdateStatus;
|
||||
FBSDK_EXTERN NSString *const FBSDKAppEventNameFBSDKLiveStreamingVideoID;
|
||||
FBSDK_EXTERN NSString *const FBSDKAppEventNameFBSDKLiveStreamingMic;
|
||||
FBSDK_EXTERN NSString *const FBSDKAppEventNameFBSDKLiveStreamingCamera;
|
||||
|
||||
/** Use to log the results of a share dialog */
|
||||
FBSDK_EXTERN NSString *const FBSDLAppEventNameFBSDKEventShareDialogResult;
|
||||
FBSDK_EXTERN NSString *const FBSDKAppEventNameFBSDKEventMessengerShareDialogResult;
|
||||
@@ -112,6 +123,14 @@ FBSDK_EXTERN NSString *const FBSDKAppEventParameterDialogShareContentPageID;
|
||||
FBSDK_EXTERN NSString *const FBSDKAppEventParameterShareTrayActivityName;
|
||||
FBSDK_EXTERN NSString *const FBSDKAppEventParameterShareTrayResult;
|
||||
|
||||
/*! Use to log parameters for live streaming*/
|
||||
FBSDK_EXTERN NSString *const FBSDKAppEventParameterLiveStreamingPrevStatus;
|
||||
FBSDK_EXTERN NSString *const FBSDKAppEventParameterLiveStreamingStatus;
|
||||
FBSDK_EXTERN NSString *const FBSDKAppEventParameterLiveStreamingError;
|
||||
FBSDK_EXTERN NSString *const FBSDKAppEventParameterLiveStreamingVideoID;
|
||||
FBSDK_EXTERN NSString *const FBSDKAppEventParameterLiveStreamingMicEnabled;
|
||||
FBSDK_EXTERN NSString *const FBSDKAppEventParameterLiveStreamingCameraEnabled;
|
||||
|
||||
// Internally known event parameter values
|
||||
|
||||
FBSDK_EXTERN NSString *const FBSDKAppEventsDialogOutcomeValue_Completed;
|
||||
@@ -147,6 +166,7 @@ FBSDK_EXTERN NSString *const FBSDKAppEventNameFBSDKLikeButtonImpression;
|
||||
FBSDK_EXTERN NSString *const FBSDKAppEventNameFBSDKLoginButtonImpression;
|
||||
FBSDK_EXTERN NSString *const FBSDKAppEventNameFBSDKSendButtonImpression;
|
||||
FBSDK_EXTERN NSString *const FBSDKAppEventNameFBSDKShareButtonImpression;
|
||||
FBSDK_EXTERN NSString *const FBSDKAppEventNameFBSDKLiveStreamingButtonImpression;
|
||||
|
||||
FBSDK_EXTERN NSString *const FBSDKAppEventNameFBSDKSmartLoginService;
|
||||
|
||||
@@ -154,6 +174,7 @@ FBSDK_EXTERN NSString *const FBSDKAppEventNameFBSDKLikeButtonDidTap;
|
||||
FBSDK_EXTERN NSString *const FBSDKAppEventNameFBSDKLoginButtonDidTap;
|
||||
FBSDK_EXTERN NSString *const FBSDKAppEventNameFBSDKSendButtonDidTap;
|
||||
FBSDK_EXTERN NSString *const FBSDKAppEventNameFBSDKShareButtonDidTap;
|
||||
FBSDK_EXTERN NSString *const FBSDKAppEventNameFBSDKLiveStreamingButtonDidTap;
|
||||
|
||||
FBSDK_EXTERN NSString *const FBSDKAppEventNameFBSDKLikeControlDidDisable;
|
||||
FBSDK_EXTERN NSString *const FBSDKAppEventNameFBSDKLikeControlDidLike;
|
||||
|
||||
@@ -66,6 +66,7 @@ implicitPurchaseLoggingEnabled:(BOOL)implicitPurchaseLoggingEnabled
|
||||
smartLoginOptions:(FBSDKServerConfigurationSmartLoginOptions)smartLoginOptions
|
||||
smartLoginBookmarkIconURL:(NSURL *)smartLoginBookmarkIconURL
|
||||
smartLoginMenuIconURL:(NSURL *)smartLoginMenuIconURL
|
||||
updateMessage:(NSString *)updateMessage
|
||||
NS_DESIGNATED_INITIALIZER;
|
||||
|
||||
@property (nonatomic, assign, readonly, getter=isAdvertisingIDEnabled) BOOL advertisingIDEnabled;
|
||||
@@ -87,6 +88,7 @@ NS_DESIGNATED_INITIALIZER;
|
||||
@property (nonatomic, assign, readonly) FBSDKServerConfigurationSmartLoginOptions smartLoginOptions;
|
||||
@property (nonatomic, copy, readonly) NSURL *smartLoginBookmarkIconURL;
|
||||
@property (nonatomic, copy, readonly) NSURL *smartLoginMenuIconURL;
|
||||
@property (nonatomic, copy, readonly) NSString *updateMessage;
|
||||
@property (nonatomic, readonly) NSInteger version;
|
||||
|
||||
- (FBSDKDialogConfiguration *)dialogConfigurationForDialogName:(NSString *)dialogName;
|
||||
|
||||
@@ -42,6 +42,7 @@
|
||||
#define FBSDK_SERVER_CONFIGURATION_SMART_LOGIN_OPTIONS_KEY @"smartLoginEnabled"
|
||||
#define FBSDK_SERVER_CONFIGURATION_SMART_LOGIN_BOOKMARK_ICON_URL_KEY @"smarstLoginBookmarkIconURL"
|
||||
#define FBSDK_SERVER_CONFIGURATION_SMART_LOGIN_MENU_ICON_URL_KEY @"smarstLoginBookmarkMenuURL"
|
||||
#define FBSDK_SERVER_CONFIGURATION_UPDATE_MESSAGE_KEY @"SDKUpdateMessage"
|
||||
#define FBSDK_SERVER_CONFIGURATION_VERSION_KEY @"version"
|
||||
|
||||
#pragma mark - Dialog Names
|
||||
@@ -101,6 +102,7 @@ implicitPurchaseLoggingEnabled:(BOOL)implicitPurchaseLoggingEnabled
|
||||
smartLoginOptions:(FBSDKServerConfigurationSmartLoginOptions)smartLoginOptions
|
||||
smartLoginBookmarkIconURL:(NSURL *)smartLoginBookmarkIconURL
|
||||
smartLoginMenuIconURL:(NSURL *)smartLoginMenuIconURL
|
||||
updateMessage:(NSString *)updateMessage
|
||||
{
|
||||
if ((self = [super init])) {
|
||||
_appID = [appID copy];
|
||||
@@ -124,6 +126,7 @@ implicitPurchaseLoggingEnabled:(BOOL)implicitPurchaseLoggingEnabled
|
||||
_smartLoginOptions = smartLoginOptions;
|
||||
_smartLoginMenuIconURL = [smartLoginMenuIconURL copy];
|
||||
_smartLoginBookmarkIconURL = [smartLoginBookmarkIconURL copy];
|
||||
_updateMessage = [updateMessage copy];
|
||||
_version = FBSDKServerConfigurationVersion;
|
||||
}
|
||||
return self;
|
||||
@@ -205,6 +208,7 @@ implicitPurchaseLoggingEnabled:(BOOL)implicitPurchaseLoggingEnabled
|
||||
NSString *loggingToken = [decoder decodeObjectOfClass:[NSString class] forKey:FBSDK_SERVER_CONFIGURATION_LOGGING_TOKEN];
|
||||
NSURL *smartLoginBookmarkIconURL = [decoder decodeObjectOfClass:[NSURL class] forKey:FBSDK_SERVER_CONFIGURATION_SMART_LOGIN_BOOKMARK_ICON_URL_KEY];
|
||||
NSURL *smartLoginMenuIconURL = [decoder decodeObjectOfClass:[NSURL class] forKey:FBSDK_SERVER_CONFIGURATION_SMART_LOGIN_MENU_ICON_URL_KEY];
|
||||
NSString *updateMessage = [decoder decodeObjectOfClass:[NSString class] forKey:FBSDK_SERVER_CONFIGURATION_UPDATE_MESSAGE_KEY];
|
||||
NSInteger version = [decoder decodeIntegerForKey:FBSDK_SERVER_CONFIGURATION_VERSION_KEY];
|
||||
FBSDKServerConfiguration *configuration = [self initWithAppID:appID
|
||||
appName:appName
|
||||
@@ -227,6 +231,7 @@ implicitPurchaseLoggingEnabled:(BOOL)implicitPurchaseLoggingEnabled
|
||||
smartLoginOptions:smartLoginOptions
|
||||
smartLoginBookmarkIconURL:smartLoginBookmarkIconURL
|
||||
smartLoginMenuIconURL:smartLoginMenuIconURL
|
||||
updateMessage:updateMessage
|
||||
];
|
||||
configuration->_version = version;
|
||||
return configuration;
|
||||
@@ -256,6 +261,7 @@ implicitPurchaseLoggingEnabled:(BOOL)implicitPurchaseLoggingEnabled
|
||||
[encoder encodeInteger:_smartLoginOptions forKey:FBSDK_SERVER_CONFIGURATION_SMART_LOGIN_OPTIONS_KEY];
|
||||
[encoder encodeObject:_smartLoginBookmarkIconURL forKey:FBSDK_SERVER_CONFIGURATION_SMART_LOGIN_BOOKMARK_ICON_URL_KEY];
|
||||
[encoder encodeObject:_smartLoginMenuIconURL forKey:FBSDK_SERVER_CONFIGURATION_SMART_LOGIN_MENU_ICON_URL_KEY];
|
||||
[encoder encodeObject:_updateMessage forKey:FBSDK_SERVER_CONFIGURATION_UPDATE_MESSAGE_KEY];
|
||||
[encoder encodeInteger:_version forKey:FBSDK_SERVER_CONFIGURATION_VERSION_KEY];
|
||||
}
|
||||
|
||||
|
||||
@@ -50,6 +50,7 @@
|
||||
#define FBSDK_SERVER_CONFIGURATION_SMART_LOGIN_OPTIONS_FIELD @"seamless_login"
|
||||
#define FBSDK_SERVER_CONFIGURATION_SMART_LOGIN_BOOKMARK_ICON_URL_FIELD @"smart_login_bookmark_icon_url"
|
||||
#define FBSDK_SERVER_CONFIGURATION_SMART_LOGIN_MENU_ICON_URL_FIELD @"smart_login_menu_icon_url"
|
||||
#define FBSDK_SERVER_CONFIGURATION_UPDATE_MESSAGE_FIELD @"sdk_update_message"
|
||||
|
||||
@implementation FBSDKServerConfigurationManager
|
||||
|
||||
@@ -59,6 +60,7 @@ static FBSDKServerConfiguration *_serverConfiguration;
|
||||
static NSError *_serverConfigurationError;
|
||||
static NSDate *_serverConfigurationErrorTimestamp;
|
||||
static const NSTimeInterval kTimeout = 4.0;
|
||||
static BOOL _printedUpdateMessage;
|
||||
|
||||
typedef NS_OPTIONS(NSUInteger, FBSDKServerConfigurationManagerAppEventsFeatures)
|
||||
{
|
||||
@@ -191,6 +193,7 @@ typedef NS_OPTIONS(NSUInteger, FBSDKServerConfigurationManagerAppEventsFeatures)
|
||||
FBSDKServerConfigurationSmartLoginOptions smartLoginOptions = [FBSDKTypeUtility integerValue:resultDictionary[FBSDK_SERVER_CONFIGURATION_SMART_LOGIN_OPTIONS_FIELD]];
|
||||
NSURL *smartLoginBookmarkIconURL = [FBSDKTypeUtility URLValue:resultDictionary[FBSDK_SERVER_CONFIGURATION_SMART_LOGIN_BOOKMARK_ICON_URL_FIELD]];
|
||||
NSURL *smartLoginMenuIconURL = [FBSDKTypeUtility URLValue:resultDictionary[FBSDK_SERVER_CONFIGURATION_SMART_LOGIN_MENU_ICON_URL_FIELD]];
|
||||
NSString *updateMessage = [FBSDKTypeUtility stringValue:resultDictionary[FBSDK_SERVER_CONFIGURATION_UPDATE_MESSAGE_FIELD]];
|
||||
FBSDKServerConfiguration *serverConfiguration = [[FBSDKServerConfiguration alloc] initWithAppID:appID
|
||||
appName:appName
|
||||
loginTooltipEnabled:loginTooltipEnabled
|
||||
@@ -212,6 +215,7 @@ typedef NS_OPTIONS(NSUInteger, FBSDKServerConfigurationManagerAppEventsFeatures)
|
||||
smartLoginOptions:smartLoginOptions
|
||||
smartLoginBookmarkIconURL:smartLoginBookmarkIconURL
|
||||
smartLoginMenuIconURL:smartLoginMenuIconURL
|
||||
updateMessage:updateMessage
|
||||
];
|
||||
#if TARGET_OS_TV
|
||||
// don't download icons more than once a day.
|
||||
@@ -254,6 +258,9 @@ typedef NS_OPTIONS(NSUInteger, FBSDKServerConfigurationManagerAppEventsFeatures)
|
||||
FBSDK_SERVER_CONFIGURATION_SYSTEM_AUTHENTICATION_ENABLED_FIELD,
|
||||
FBSDK_SERVER_CONFIGURATION_SESSION_TIMEOUT_FIELD,
|
||||
FBSDK_SERVER_CONFIGURATION_LOGGIN_TOKEN_FIELD
|
||||
#ifdef DEBUG
|
||||
,FBSDK_SERVER_CONFIGURATION_UPDATE_MESSAGE_FIELD
|
||||
#endif
|
||||
#if TARGET_OS_TV
|
||||
,FBSDK_SERVER_CONFIGURATION_SMART_LOGIN_OPTIONS_FIELD,
|
||||
FBSDK_SERVER_CONFIGURATION_SMART_LOGIN_BOOKMARK_ICON_URL_FIELD,
|
||||
@@ -313,6 +320,7 @@ typedef NS_OPTIONS(NSUInteger, FBSDKServerConfigurationManagerAppEventsFeatures)
|
||||
smartLoginOptions:FBSDKServerConfigurationSmartLoginOptionsUnknown
|
||||
smartLoginBookmarkIconURL:nil
|
||||
smartLoginMenuIconURL:nil
|
||||
updateMessage:nil
|
||||
];
|
||||
}
|
||||
return _defaultServerConfiguration;
|
||||
@@ -342,6 +350,14 @@ typedef NS_OPTIONS(NSUInteger, FBSDKServerConfigurationManagerAppEventsFeatures)
|
||||
_serverConfiguration = serverConfiguration;
|
||||
_serverConfigurationError = nil;
|
||||
_serverConfigurationErrorTimestamp = nil;
|
||||
|
||||
#ifdef DEBUG
|
||||
NSString *updateMessage = _serverConfiguration.updateMessage;
|
||||
if (updateMessage && [updateMessage length] > 0 && !_printedUpdateMessage) {
|
||||
_printedUpdateMessage = YES;
|
||||
NSLog(@"%@", updateMessage);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
// update the cached copy in NSUserDefaults
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
Pod::Spec.new do |s|
|
||||
|
||||
s.name = "FBSDKLoginKit"
|
||||
s.version = "4.31.1"
|
||||
s.version = "4.32.0"
|
||||
s.summary = "Official Facebook SDK for iOS to access Facebook Platform with features like Login, Share and Message Dialog, App Links, and Graph API"
|
||||
|
||||
s.description = <<-DESC
|
||||
@@ -21,7 +21,7 @@ Pod::Spec.new do |s|
|
||||
s.ios.deployment_target = "7.0"
|
||||
|
||||
s.source = { :git => "https://github.com/facebook/facebook-ios-sdk.git",
|
||||
:tag => "sdk-version-4.31.1"
|
||||
:tag => "sdk-version-4.32.0"
|
||||
}
|
||||
|
||||
s.weak_frameworks = "Accounts", "CoreLocation", "Social", "Security", "QuartzCore", "CoreGraphics", "UIKit", "Foundation", "AudioToolbox"
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
Pod::Spec.new do |s|
|
||||
|
||||
s.name = "FBSDKPlacesKit"
|
||||
s.version = "4.31.1"
|
||||
s.version = "4.32.0"
|
||||
s.summary = "Official Facebook SDK for iOS to access Facebook Places"
|
||||
|
||||
s.description = <<-DESC
|
||||
@@ -20,7 +20,7 @@ Pod::Spec.new do |s|
|
||||
s.ios.deployment_target = "7.0"
|
||||
|
||||
s.source = { :git => "https://github.com/facebook/facebook-ios-sdk.git",
|
||||
:tag => "sdk-version-4.31.1"
|
||||
:tag => "sdk-version-4.32.0"
|
||||
}
|
||||
|
||||
s.weak_frameworks = "Accounts", "CoreLocation", "Social", "Security", "Foundation"
|
||||
|
||||
@@ -135,9 +135,33 @@ typedef void (^FBSDKCurrentPlaceGraphRequestCompletion)(FBSDKGraphRequest *_Null
|
||||
@param completion A `FBSDKCurrentPlaceGraphRequestCompletion` block, that contains the graph request.
|
||||
*/
|
||||
- (void)generateCurrentPlaceRequestWithMinimumConfidenceLevel:(FBSDKPlaceLocationConfidence)minimumConfidence
|
||||
fields:(nullable NSArray *)fields
|
||||
fields:(nullable NSArray<NSString *> *)fields
|
||||
completion:(nonnull FBSDKCurrentPlaceGraphRequestCompletion)completion;
|
||||
|
||||
/**
|
||||
Method for generating a graph request to query for places the device is likely
|
||||
located in. This method allows the user to pass in a CLLocation, as the above method
|
||||
can be real-world slow at obtaining a location from device (on the order of multiple
|
||||
seconds). This is still an asynchronous call, as the bluetooth scan still needs to
|
||||
happen, however it is relatively fast (0.5 seconds). Note that the results of the
|
||||
graph request are improved if the user has both Wi-Fi and Bluetooth enabled.
|
||||
|
||||
@param currentLocation The current location of the device. If the location passed in here
|
||||
isn't actually the current location, accuracy of results will be diminished.
|
||||
|
||||
@param minimumConfidence The Minimum Confidence level place estimate candidates must meet.
|
||||
|
||||
@param fields A list of fields that you might want the request to return. See
|
||||
`FBSDKPlacesKitConstants.h` for the fields exposed by the SDK, and see https://developers.intern.facebook.com/docs/places/fields
|
||||
for the most up to date list.
|
||||
|
||||
@param completion A `FBSDKCurrentPlaceGraphRequestCompletion` block, that contains the graph request.
|
||||
*/
|
||||
- (void)generateCurrentPlaceRequestForCurrentLocation:(nonnull CLLocation *)currentLocation
|
||||
withMinimumConfidenceLevel:(FBSDKPlaceLocationConfidence)minimumConfidence
|
||||
fields:(nullable NSArray<NSString *> *)fields
|
||||
completion:(nonnull FBSDKCurrentPlaceGraphRequestCompletion)completion;
|
||||
|
||||
/**
|
||||
Method for generating a graph request to provide feedback to the Places Graph about
|
||||
the accuracy of current place estimate candidates. We'd very much appreciate it if
|
||||
|
||||
@@ -110,7 +110,7 @@ typedef void (^FBSDKLocationRequestCompletion)(CLLocation *_Nullable location, N
|
||||
}
|
||||
|
||||
- (void)generateCurrentPlaceRequestWithMinimumConfidenceLevel:(FBSDKPlaceLocationConfidence)minimumConfidence
|
||||
fields:(NSArray *)fields
|
||||
fields:(NSArray<NSString *> *)fields
|
||||
completion:(FBSDKCurrentPlaceGraphRequestCompletion)completion
|
||||
{
|
||||
|
||||
@@ -145,6 +145,16 @@ typedef void (^FBSDKLocationRequestCompletion)(CLLocation *_Nullable location, N
|
||||
});
|
||||
}
|
||||
|
||||
- (void)generateCurrentPlaceRequestForCurrentLocation:(CLLocation *)currentLocation
|
||||
withMinimumConfidenceLevel:(FBSDKPlaceLocationConfidence)minimumConfidence
|
||||
fields:(nullable NSArray<NSString *> *)fields
|
||||
completion:(nonnull FBSDKCurrentPlaceGraphRequestCompletion)completion
|
||||
{
|
||||
[self.bluetoothScanner scanForBeaconsWithCompletion:^(NSArray<FBSDKBluetoothBeacon *> * _Nullable beacons) {
|
||||
completion([self _currentPlaceGraphRequestForLocation:currentLocation bluetoothBeacons:beacons minimumConfidenceLevel:minimumConfidence fields:fields], nil);
|
||||
}];
|
||||
}
|
||||
|
||||
|
||||
- (FBSDKGraphRequest *)currentPlaceFeedbackRequestForPlaceID:(NSString *)placeID
|
||||
tracking:(NSString *)tracking
|
||||
|
||||
@@ -47,7 +47,7 @@ static NSTimeInterval const scanLength = 0.5;
|
||||
{
|
||||
self = [super init];
|
||||
if (self) {
|
||||
_manager = [[CBCentralManager alloc] initWithDelegate:self queue:nil];
|
||||
_manager = [[CBCentralManager alloc] initWithDelegate:self queue:nil options:@{CBCentralManagerOptionShowPowerAlertKey: @NO}];
|
||||
_discoveredBeacons = [NSMutableArray new];
|
||||
_eddystoneBeaconUUID = [CBUUID UUIDWithString:EddystoneBeaconUUIDString];
|
||||
_bluetoothServices = @[[CBUUID UUIDWithString:FBBeaconUUIDString], _eddystoneBeaconUUID];
|
||||
@@ -98,6 +98,7 @@ static NSTimeInterval const scanLength = 0.5;
|
||||
completion(nil);
|
||||
}
|
||||
}
|
||||
[self.scanCompletionBlocks removeAllObjects];
|
||||
self.didPerformScan = NO;
|
||||
}
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
Pod::Spec.new do |s|
|
||||
|
||||
s.name = "FBSDKShareKit"
|
||||
s.version = "4.31.1"
|
||||
s.version = "4.32.0"
|
||||
s.summary = "Official Facebook SDK for iOS to access Facebook Platform's Sharing Features"
|
||||
|
||||
s.description = <<-DESC
|
||||
@@ -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.31.1"
|
||||
:tag => "sdk-version-4.32.0"
|
||||
}
|
||||
|
||||
s.ios.weak_frameworks = 'Accounts', 'AudioToolbox', 'CoreGraphics', 'CoreLocation', 'Foundation', 'QuartzCore', 'Security', 'Social', 'UIKit'
|
||||
@@ -80,6 +80,6 @@ Pod::Spec.new do |s|
|
||||
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', '~> 4.31.1'
|
||||
s.dependency 'FBSDKCoreKit', '~> 4.32.0'
|
||||
|
||||
end
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
Pod::Spec.new do |s|
|
||||
|
||||
s.name = 'FBSDKTVOSKit'
|
||||
s.version = '4.31.1'
|
||||
s.version = '4.32.0'
|
||||
s.summary = 'Official Facebook SDK for tvOS to access Facebook Platform with features like Login and Graph API.'
|
||||
|
||||
s.description = <<-DESC
|
||||
@@ -20,7 +20,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.31.1' }
|
||||
:tag => 'sdk-version-4.32.0' }
|
||||
|
||||
s.source_files = 'FBSDKTVOSKit/FBSDKTVOSKit/**/*.{h,m}'
|
||||
s.public_header_files = 'FBSDKTVOSKit/FBSDKTVOSKit/*.h'
|
||||
|
||||
@@ -202,7 +202,7 @@ else
|
||||
\cp -R "$FB_SDK_BUILD"/FBSDKShareKit.framework "$FB_SDK_BUILD_PACKAGE" \
|
||||
|| die "Could not copy FBSDKShareKit.framework"
|
||||
\cp -R "$FB_SDK_BUILD"/FBSDKPlacesKit.framework "$FB_SDK_BUILD_PACKAGE" \
|
||||
|| die "Could not copy FBSDKPlacesKit.framework"
|
||||
|| 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" \
|
||||
|
||||
@@ -40,7 +40,7 @@ do
|
||||
KITREFDOCS=${KITS[$i]};
|
||||
|
||||
# Actually generate the documentation
|
||||
jazzy --objc --framework-root $FB_SDK_ROOT/$KITREFDOCS --umbrella-header $FB_SDK_ROOT/$KITREFDOCS/$KITREFDOCS/$KITREFDOCS.h --sdk iphoneos --clean --output $FB_SDK_ROOT/docs/$KITREFDOCS
|
||||
jazzy --objc --framework-root "$FB_SDK_ROOT"/"$KITREFDOCS" --umbrella-header "$FB_SDK_ROOT"/"$KITREFDOCS"/"$KITREFDOCS"/"$KITREFDOCS".h --sdk iphonesimulator --clean --output "$FB_SDK_ROOT"/docs/"$KITREFDOCS"
|
||||
|
||||
# Zip the result so it can be uploaded easily
|
||||
pushd $FB_SDK_ROOT/docs/
|
||||
|
||||
2
vendor/OCMock
vendored
2
vendor/OCMock
vendored
Submodule vendor/OCMock updated: 812b5db86a...17b1894d7a
2
vendor/appledoc
vendored
2
vendor/appledoc
vendored
Submodule vendor/appledoc updated: 77943ab37f...38649712db
2
vendor/ios-snapshot-test-case
vendored
2
vendor/ios-snapshot-test-case
vendored
Submodule vendor/ios-snapshot-test-case updated: 770cc4fcb8...3efc829601
Reference in New Issue
Block a user