From 49b8839fda3439edc31581527e84036e58f55f0f Mon Sep 17 00:00:00 2001 From: lpw <pengwei.li@gamehollywood.com> Date: Tue, 26 Jan 2021 09:43:00 +0800 Subject: [PATCH] 3.9.2 --- frameworks/FBSDKCoreKit.framework/Headers/FBSDKAppLinkReturnToRefererController.h | 7 frameworks/FBSDKCoreKit.framework/Headers/FBSDKMutableCopying.h | 8 frameworks/FBSDKCoreKit.framework/Headers/FBSDKProfile.h | 6 frameworks/FBSDKCoreKit.framework/FBSDKCoreKit | 0 frameworks/FBSDKShareKit.framework/Headers/FBSDKSharingButton.h | 8 frameworks/FBSDKLoginKit.framework/FBSDKLoginKit | 0 frameworks/FBSDKLoginKit.framework/Headers/FBSDKLoginManager.h | 79 ++- frameworks/FBSDKShareKit.framework/Headers/FBSDKSendButton.h | 13 frameworks/FBSDKShareKit.framework/Headers/FBSDKSharing.h | 4 frameworks/FBSDKCoreKit.framework/Headers/FBSDKMeasurementEvent.h | 6 frameworks/FBSDKCoreKit.framework/Headers/FBSDKAppLink.h | 10 frameworks/FBSDKShareKit.framework/FBSDKShareKit | 0 frameworks/FBSDKCoreKit.framework/Headers/FBSDKAppLinkTarget.h | 10 frameworks/FBSDKCoreKit.framework/Headers/FBSDKAppEvents.h | 14 frameworks/FBSDKLoginKit.framework/Headers/FBSDKLoginTooltipView.h | 8 frameworks/FBSDKShareKit.framework/Headers/FBSDKShareLinkContent.h | 2 frameworks/FBSDKLoginKit.framework/Info.plist | 0 frameworks/FBSDKShareKit.framework/Headers/FBSDKSharingScheme.h | 6 frameworks/FBSDKShareKit.framework/Headers/FBSDKSharePhoto.h | 6 frameworks/FBSDKShareKit.framework/Headers/FBSDKAppInviteContent.h | 11 frameworks/FBSDKCoreKit.framework/Headers/FBSDKAppLinkResolverRequestBuilder.h | 30 frameworks/FBSDKShareKit.framework/Headers/FBSDKShareVideoContent.h | 6 frameworks/FBSDKLoginKit.framework/Headers/FBSDKLoginButton.h | 23 frameworks/FBSDKCoreKit.framework/Headers/FBSDKAppLinkResolver.h | 6 frameworks/FBSDKShareKit.framework/Headers/FBSDKShareKit.h | 61 +- frameworks/FBSDKCoreKit.framework/Headers/FBSDKProfilePictureView.h | 36 + frameworks/FBSDKShareKit.framework/Headers/FBSDKAppGroupContent.h | 13 frameworks/FBSDKCoreKit.framework/Headers/FBSDKAppLinkNavigation.h | 6 frameworks/FBSDKCoreKit.framework/Headers/FBSDKCoreKit.h | 116 +++- frameworks/FBSDKCoreKit.framework/Info.plist | 0 frameworks/FBSDKLoginKit.framework/Headers/FBSDKLoginKit.h | 21 frameworks/FBSDKShareKit.framework/Headers/FBSDKSharePhotoContent.h | 2 frameworks/FBSDKShareKit.framework/Headers/FBSDKShareButton.h | 10 frameworks/FBSDKLoginKit.framework/Headers/FBSDKDeviceLoginManagerResult.h | 4 frameworks/FBSDKCoreKit.framework/Headers/FBSDKConstants.h | 5 frameworks/FBSDKShareKit.framework/Headers/FBSDKGameRequestContent.h | 11 frameworks/FBSDKShareKit.framework/Info.plist | 0 frameworks/FBSDKCoreKit.framework/Headers/FBSDKAppLinkResolving.h | 6 frameworks/WAFbImpl.framework/Headers/WAFbImpl.h | 2 frameworks/FBSDKCoreKit.framework/Headers/FBSDKAccessToken.h | 44 + frameworks/FBSDKShareKit.framework/Headers/FBSDKShareConstants.h | 4 config/wa_sdk_impl_config_facebook.xml | 2 frameworks/FBSDKShareKit.framework/Headers/FBSDKShareDialog.h | 27 + frameworks/FBSDKShareKit.framework/Headers/FBSDKCameraEffectTextures.h | 8 frameworks/FBSDKShareKit.framework/Headers/FBSDKSharingContent.h | 4 frameworks/FBSDKLoginKit.framework/Headers/FBSDKTooltipView.h | 6 WAFbImpl.podspec | 2 frameworks/FBSDKLoginKit.framework/Headers/FBSDKReferralCode.h | 35 + frameworks/FBSDKShareKit.framework/Headers/FBSDKShareVideo.h | 7 frameworks/FBSDKCoreKit.framework/Headers/FBSDKWebViewAppLinkResolver.h | 6 frameworks/FBSDKShareKit.framework/Headers/FBSDKCoreKitImport.h | 33 - frameworks/FBSDKShareKit.framework/Headers/FBSDKShareCameraEffectContent.h | 14 frameworks/WAFbImpl.framework/Info.plist | 0 frameworks/FBSDKLoginKit.framework/Headers/FBSDKReferralManager.h | 60 ++ frameworks/FBSDKCoreKit.framework/Headers/FBSDKGraphRequest.h | 2 frameworks/FBSDKShareKit.framework/Headers/FBSDKLiking.h | 6 frameworks/FBSDKCoreKit.framework/Headers/FBSDKGraphRequestConnection.h | 4 WAFbImpl/3.9.2/WAFbImpl.podspec | 25 + frameworks/FBSDKLoginKit.framework/Headers/FBSDKDeviceLoginManager.h | 4 /dev/null | 189 -------- frameworks/FBSDKShareKit.framework/Headers/FBSDKGameRequestDialog.h | 8 frameworks/FBSDKShareKit.framework/Headers/FBSDKHashtag.h | 2 frameworks/WAFbImpl.framework/WAFbImpl | 0 frameworks/FBSDKLoginKit.framework/Headers/FBSDKCoreKitImport.h | 33 - frameworks/FBSDKShareKit.framework/Headers/FBSDKMessageDialog.h | 17 frameworks/FBSDKCoreKit.framework/Headers/FBSDKURL.h | 11 frameworks/FBSDKCoreKit.framework/Headers/FBSDKAppLinkReturnToRefererView.h | 7 frameworks/FBSDKShareKit.framework/Headers/FBSDKShareMediaContent.h | 2 frameworks/FBSDKCoreKit.framework/Headers/FBSDKAppLinkUtility.h | 13 frameworks/FBSDKLoginKit.framework/Headers/FBSDKReferralManagerResult.h | 59 ++ frameworks/FBSDKShareKit.framework/Headers/FBSDKCameraEffectArguments.h | 8 frameworks/FBSDKCoreKit.framework/Headers/FBSDKSettings.h | 54 + frameworks/FBSDKCoreKit.framework/Headers/FBSDKGraphErrorRecoveryProcessor.h | 10 frameworks/FBSDKLoginKit.framework/Headers/FBSDKLoginManagerLoginResult.h | 24 + 74 files changed, 823 insertions(+), 463 deletions(-) diff --git a/WAFbImpl.podspec b/WAFbImpl.podspec index 26c7d40..8edb613 100644 --- a/WAFbImpl.podspec +++ b/WAFbImpl.podspec @@ -9,7 +9,7 @@ Pod::Spec.new do |s| s.name = 'WAFbImpl' -s.version = '3.8.4' +s.version = '3.9.2' s.summary = 'WAFbImpl framework in production environment.' s.license = 'MIT' s.author = { "Wuyx" => "wuyixin_gh@gamehollywood.com" } diff --git a/WAFbImpl/3.9.2/WAFbImpl.podspec b/WAFbImpl/3.9.2/WAFbImpl.podspec new file mode 100644 index 0000000..8edb613 --- /dev/null +++ b/WAFbImpl/3.9.2/WAFbImpl.podspec @@ -0,0 +1,25 @@ +# +# Be sure to run `pod spec lint WAFbImpl.podspec' to ensure this is a +# valid spec and to remove all comments including this before submitting the spec. +# +# To learn more about Podspec attributes see http://docs.cocoapods.org/specification.html +# To see working Podspecs in the CocoaPods repo see https://github.com/CocoaPods/Specs/ +# + +Pod::Spec.new do |s| + +s.name = 'WAFbImpl' +s.version = '3.9.2' +s.summary = 'WAFbImpl framework in production environment.' +s.license = 'MIT' +s.author = { "Wuyx" => "wuyixin_gh@gamehollywood.com" } +s.homepage = 'http://repo.wingsdk.cn:8082/summary/WAFbImpl.git' +s.source = { :git => "http://admin@repo.wingsdk.cn:8082/r/WAFbImpl.git" , :tag => s.version} +s.platform = :ios +s.ios.deployment_target = "7.0" +s.vendored_frameworks = 'frameworks/*.framework' +s.resources = ['config/*.xml','bundle/FacebookSDKStrings.bundle'] +s.requires_arc = true +s.dependency 'WASdkIntf' +s.dependency 'WASdkImpl' +end diff --git a/config/wa_sdk_impl_config_facebook.xml b/config/wa_sdk_impl_config_facebook.xml index 9085f60..923e619 100644 --- a/config/wa_sdk_impl_config_facebook.xml +++ b/config/wa_sdk_impl_config_facebook.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <config> - <version val="FB3.8.4"/> + <version val="FB3.9.2"/> <comps> <!-- 用户模块 --> <comp module="USR" plaf="FACEBOOK" mandatory="NO" value="WAFBUser" desc="FACEBOOK用户账户"/> diff --git a/frameworks/FBSDKCoreKit.framework/FBSDKCoreKit b/frameworks/FBSDKCoreKit.framework/FBSDKCoreKit index d782145..8f09d50 100644 --- a/frameworks/FBSDKCoreKit.framework/FBSDKCoreKit +++ b/frameworks/FBSDKCoreKit.framework/FBSDKCoreKit Binary files differ diff --git a/frameworks/FBSDKCoreKit.framework/Headers/FBSDKAccessToken.h b/frameworks/FBSDKCoreKit.framework/Headers/FBSDKAccessToken.h index 94f9f8f..82a9b3d 100644 --- a/frameworks/FBSDKCoreKit.framework/Headers/FBSDKAccessToken.h +++ b/frameworks/FBSDKCoreKit.framework/Headers/FBSDKAccessToken.h @@ -18,8 +18,13 @@ #import <Foundation/Foundation.h> -#import <FBSDKCoreKit/FBSDKCopying.h> +#import "FBSDKCopying.h" + +#ifdef BUCK #import <FBSDKCoreKit/FBSDKGraphRequestConnection.h> +#else +#import "FBSDKGraphRequestConnection.h" +#endif NS_ASSUME_NONNULL_BEGIN @@ -158,6 +163,11 @@ @property (nonatomic, copy, readonly) NSString *userID; /** + The graph domain where this access token is valid. + */ +@property (nonatomic, copy, readonly) NSString *graphDomain; + +/** Returns whether the access token is expired by checking its expirationDate property */ @property (readonly, assign, nonatomic, getter=isExpired) BOOL expired; @@ -202,6 +212,38 @@ NS_DESIGNATED_INITIALIZER; /** + Convenience initializer. + @param tokenString the opaque token string. + @param permissions the granted permissions. Note this is converted to NSSet and is only + an NSArray for the convenience of literal syntax. + @param declinedPermissions the declined permissions. Note this is converted to NSSet and is only + an NSArray for the convenience of literal syntax. + @param expiredPermissions the expired permissions. Note this is converted to NSSet and is only + an NSArray for the convenience of literal syntax. + @param appID the app ID. + @param userID the user ID. + @param expirationDate the optional expiration date (defaults to distantFuture). + @param refreshDate the optional date the token was last refreshed (defaults to today). + @param dataAccessExpirationDate the date which data access will expire for the given user + (defaults to distantFuture). + @param graphDomain the domain this access token can be used in. + + This initializer should only be used for advanced apps that + manage tokens explicitly. Typical login flows only need to use `FBSDKLoginManager` + along with `+currentAccessToken`. + */ +- (instancetype)initWithTokenString:(NSString *)tokenString + permissions:(NSArray<NSString *> *)permissions + declinedPermissions:(NSArray<NSString *> *)declinedPermissions + expiredPermissions:(NSArray<NSString *> *)expiredPermissions + appID:(NSString *)appID + userID:(NSString *)userID + expirationDate:(nullable NSDate *)expirationDate + refreshDate:(nullable NSDate *)refreshDate + dataAccessExpirationDate:(nullable NSDate *)dataAccessExpirationDate + graphDomain:(nullable NSString *)graphDomain; + +/** Convenience getter to determine if a permission has been granted @param permission The permission to check. */ diff --git a/frameworks/FBSDKCoreKit.framework/Headers/FBSDKAppEvents.h b/frameworks/FBSDKCoreKit.framework/Headers/FBSDKAppEvents.h index 37ff15e..28ab185 100644 --- a/frameworks/FBSDKCoreKit.framework/Headers/FBSDKAppEvents.h +++ b/frameworks/FBSDKCoreKit.framework/Headers/FBSDKAppEvents.h @@ -22,7 +22,11 @@ #import <WebKit/WebKit.h> #endif +#ifdef BUCK #import <FBSDKCoreKit/FBSDKGraphRequestConnection.h> +#else +#import "FBSDKGraphRequestConnection.h" +#endif NS_ASSUME_NONNULL_BEGIN @@ -166,9 +170,6 @@ /** The booking of an appointment to visit one of your locations. */ FOUNDATION_EXPORT FBSDKAppEventName FBSDKAppEventNameSchedule; - -/** The subsequent subscriptions after the start of a paid subscription for a product or service you offer. */ -FOUNDATION_EXPORT FBSDKAppEventName FBSDKAppEventNameSubscriptionHeartbeat __attribute((deprecated("This attribute is no longer used."))); /** The start of a free trial of a product or service you offer (example: trial subscription). */ FOUNDATION_EXPORT FBSDKAppEventName FBSDKAppEventNameStartTrial; @@ -451,6 +452,11 @@ The userID is persisted until it is cleared by passing nil. */ @property (class, nonatomic, copy, nullable) NSString *userID; + +/* + Returns generated anonymous id that persisted with current install of the app +*/ +@property (class, nonatomic, readonly) NSString *anonymousID; /* * Basic event logging @@ -823,7 +829,7 @@ @param properties the custom user properties @param handler the optional completion handler */ -+ (void)updateUserProperties:(NSDictionary<NSString *, id> *)properties handler:(nullable FBSDKGraphRequestBlock)handler; ++ (void)updateUserProperties:(NSDictionary<NSString *, id> *)properties handler:(nullable FBSDKGraphRequestBlock)handler __attribute__((deprecated("updateUserProperties is deprecated"))); #if !TARGET_OS_TV /* diff --git a/frameworks/FBSDKCoreKit.framework/Headers/FBSDKAppLink.h b/frameworks/FBSDKCoreKit.framework/Headers/FBSDKAppLink.h index bcc048f..9d681b2 100644 --- a/frameworks/FBSDKCoreKit.framework/Headers/FBSDKAppLink.h +++ b/frameworks/FBSDKCoreKit.framework/Headers/FBSDKAppLink.h @@ -16,6 +16,10 @@ // 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 "TargetConditionals.h" + +#if !TARGET_OS_TV + #import <Foundation/Foundation.h> #import "FBSDKAppLinkTarget.h" @@ -47,13 +51,13 @@ from App Link metadata. @param webURL the fallback web URL, if any, for the app link. */ -+ (instancetype)appLinkWithSourceURL:(NSURL *)sourceURL ++ (instancetype)appLinkWithSourceURL:(nullable NSURL *)sourceURL targets:(NSArray<FBSDKAppLinkTarget *> *)targets webURL:(nullable NSURL *)webURL NS_SWIFT_NAME(init(sourceURL:targets:webURL:)); /** The URL from which this FBSDKAppLink was derived */ -@property (nonatomic, strong, readonly) NSURL *sourceURL; +@property (nonatomic, strong, readonly, nullable) NSURL *sourceURL; /** The ordered list of targets applicable to this platform that will be used @@ -67,3 +71,5 @@ @end NS_ASSUME_NONNULL_END + +#endif diff --git a/frameworks/FBSDKCoreKit.framework/Headers/FBSDKAppLinkNavigation.h b/frameworks/FBSDKCoreKit.framework/Headers/FBSDKAppLinkNavigation.h index 7331872..4905ca7 100644 --- a/frameworks/FBSDKCoreKit.framework/Headers/FBSDKAppLinkNavigation.h +++ b/frameworks/FBSDKCoreKit.framework/Headers/FBSDKAppLinkNavigation.h @@ -16,6 +16,10 @@ // 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 "TargetConditionals.h" + +#if !TARGET_OS_TV + #import <Foundation/Foundation.h> #import "FBSDKAppLink.h" @@ -139,3 +143,5 @@ @end NS_ASSUME_NONNULL_END + +#endif diff --git a/frameworks/FBSDKCoreKit.framework/Headers/FBSDKAppLinkResolver.h b/frameworks/FBSDKCoreKit.framework/Headers/FBSDKAppLinkResolver.h index 85127fd..88898b6 100644 --- a/frameworks/FBSDKCoreKit.framework/Headers/FBSDKAppLinkResolver.h +++ b/frameworks/FBSDKCoreKit.framework/Headers/FBSDKAppLinkResolver.h @@ -16,6 +16,10 @@ // 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 "TargetConditionals.h" + +#if !TARGET_OS_TV + #import <Foundation/Foundation.h> #import "FBSDKAppLinkResolving.h" @@ -64,3 +68,5 @@ @end NS_ASSUME_NONNULL_END + +#endif diff --git a/frameworks/FBSDKShareKit.framework/Headers/FBSDKShareMessengerActionButton.h b/frameworks/FBSDKCoreKit.framework/Headers/FBSDKAppLinkResolverRequestBuilder.h similarity index 64% copy from frameworks/FBSDKShareKit.framework/Headers/FBSDKShareMessengerActionButton.h copy to frameworks/FBSDKCoreKit.framework/Headers/FBSDKAppLinkResolverRequestBuilder.h index 710a600..9f33044 100644 --- a/frameworks/FBSDKShareKit.framework/Headers/FBSDKShareMessengerActionButton.h +++ b/frameworks/FBSDKCoreKit.framework/Headers/FBSDKAppLinkResolverRequestBuilder.h @@ -16,26 +16,34 @@ // 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 "TargetConditionals.h" + +#if !TARGET_OS_TV + #import <Foundation/Foundation.h> -#import <FBSDKCoreKit/FBSDKCopying.h> -#import <FBSDKShareKit/FBSDKShareConstants.h> - +#import "FBSDKAppLinkResolving.h" +#import "FBSDKGraphRequest.h" NS_ASSUME_NONNULL_BEGIN /** - A base interface for Messenger share action buttons. + Class responsible for generating the appropriate FBSDKGraphRequest for a given set of urls */ -DEPRECATED_FOR_MESSENGER -NS_SWIFT_NAME(ShareMessengerActionButton) -@protocol FBSDKShareMessengerActionButton <FBSDKCopying, NSSecureCoding> +NS_SWIFT_NAME(AppLinkResolverRequestBuilder) +@interface FBSDKAppLinkResolverRequestBuilder : NSObject /** - The title displayed to the user for the button. - @return The title for the button. - */ -@property (nonatomic, copy) NSString *title; + Generates the FBSDKGraphRequest + @param urls The URLs to build the requests for + */ +- (FBSDKGraphRequest* _Nonnull)requestForURLs:(NSArray<NSURL *> * _Nonnull)urls +NS_EXTENSION_UNAVAILABLE_IOS("Not available in app extension"); + +- (NSString* _Nullable)getIdiomSpecificField +NS_EXTENSION_UNAVAILABLE_IOS("Not available in app extension"); @end NS_ASSUME_NONNULL_END + +#endif diff --git a/frameworks/FBSDKCoreKit.framework/Headers/FBSDKAppLinkResolving.h b/frameworks/FBSDKCoreKit.framework/Headers/FBSDKAppLinkResolving.h index 69d5591..623a644 100644 --- a/frameworks/FBSDKCoreKit.framework/Headers/FBSDKAppLinkResolving.h +++ b/frameworks/FBSDKCoreKit.framework/Headers/FBSDKAppLinkResolving.h @@ -16,6 +16,10 @@ // 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 "TargetConditionals.h" + +#if !TARGET_OS_TV + #import <Foundation/Foundation.h> NS_ASSUME_NONNULL_BEGIN @@ -52,3 +56,5 @@ @end NS_ASSUME_NONNULL_END + +#endif diff --git a/frameworks/FBSDKCoreKit.framework/Headers/FBSDKAppLinkReturnToRefererController.h b/frameworks/FBSDKCoreKit.framework/Headers/FBSDKAppLinkReturnToRefererController.h index c8c5d48..e54b047 100644 --- a/frameworks/FBSDKCoreKit.framework/Headers/FBSDKAppLinkReturnToRefererController.h +++ b/frameworks/FBSDKCoreKit.framework/Headers/FBSDKAppLinkReturnToRefererController.h @@ -16,7 +16,10 @@ // 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 <Foundation/Foundation.h> +#import "TargetConditionals.h" + +#if !TARGET_OS_TV + #import <UIKit/UIKit.h> #import "FBSDKAppLinkReturnToRefererView.h" @@ -107,3 +110,5 @@ @end NS_ASSUME_NONNULL_END + +#endif diff --git a/frameworks/FBSDKCoreKit.framework/Headers/FBSDKAppLinkReturnToRefererView.h b/frameworks/FBSDKCoreKit.framework/Headers/FBSDKAppLinkReturnToRefererView.h index e36366a..7293e75 100644 --- a/frameworks/FBSDKCoreKit.framework/Headers/FBSDKAppLinkReturnToRefererView.h +++ b/frameworks/FBSDKCoreKit.framework/Headers/FBSDKAppLinkReturnToRefererView.h @@ -16,7 +16,10 @@ // 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 <Foundation/Foundation.h> +#import "TargetConditionals.h" + +#if !TARGET_OS_TV + #import <UIKit/UIKit.h> #import "FBSDKAppLinkNavigation.h" @@ -92,3 +95,5 @@ @end NS_ASSUME_NONNULL_END + +#endif diff --git a/frameworks/FBSDKCoreKit.framework/Headers/FBSDKAppLinkTarget.h b/frameworks/FBSDKCoreKit.framework/Headers/FBSDKAppLinkTarget.h index 99b5f15..efcb244 100644 --- a/frameworks/FBSDKCoreKit.framework/Headers/FBSDKAppLinkTarget.h +++ b/frameworks/FBSDKCoreKit.framework/Headers/FBSDKAppLinkTarget.h @@ -16,6 +16,10 @@ // 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 "TargetConditionals.h" + +#if !TARGET_OS_TV + #import <Foundation/Foundation.h> NS_ASSUME_NONNULL_BEGIN @@ -31,13 +35,13 @@ + (instancetype)new NS_UNAVAILABLE; /** Creates a FBSDKAppLinkTarget with the given app site and target URL. */ -+ (instancetype)appLinkTargetWithURL:(NSURL *)url ++ (instancetype)appLinkTargetWithURL:(nullable NSURL *)url appStoreId:(nullable NSString *)appStoreId appName:(NSString *)appName NS_SWIFT_NAME(init(url:appStoreId:appName:)); /** The URL prefix for this app link target */ -@property (nonatomic, strong, readonly) NSURL *URL; +@property (nonatomic, strong, readonly, nullable) NSURL *URL; /** The app ID for the app store */ @property (nonatomic, copy, readonly, nullable) NSString *appStoreId; @@ -48,3 +52,5 @@ @end NS_ASSUME_NONNULL_END + +#endif diff --git a/frameworks/FBSDKCoreKit.framework/Headers/FBSDKAppLinkUtility.h b/frameworks/FBSDKCoreKit.framework/Headers/FBSDKAppLinkUtility.h index 44cc919..86c5121 100644 --- a/frameworks/FBSDKCoreKit.framework/Headers/FBSDKAppLinkUtility.h +++ b/frameworks/FBSDKCoreKit.framework/Headers/FBSDKAppLinkUtility.h @@ -16,6 +16,10 @@ // 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 "TargetConditionals.h" + +#if !TARGET_OS_TV + #import <Foundation/Foundation.h> NS_ASSUME_NONNULL_BEGIN @@ -75,6 +79,15 @@ */ + (nullable NSString *)appInvitePromotionCodeFromURL:(NSURL *)url; +/** + Check whether the scheme is defined in the app's URL schemes. + @param scheme the scheme of App Link URL + @return YES if the scheme is defined, otherwise NO. +*/ ++ (BOOL)isMatchURLScheme:(NSString *)scheme; + @end NS_ASSUME_NONNULL_END + +#endif diff --git a/frameworks/FBSDKCoreKit.framework/Headers/FBSDKConstants.h b/frameworks/FBSDKCoreKit.framework/Headers/FBSDKConstants.h index 6915368..fbed266 100644 --- a/frameworks/FBSDKCoreKit.framework/Headers/FBSDKConstants.h +++ b/frameworks/FBSDKCoreKit.framework/Headers/FBSDKConstants.h @@ -323,6 +323,11 @@ Indicates an app switch to the browser (typically for a dialog) failed. */ FBSDKErrorBrowserUnavailable, + + /** + Indicates that a bridge api interaction was interrupted. + */ + FBSDKErrorBridgeAPIInterruption, } NS_SWIFT_NAME(CoreError); /** diff --git a/frameworks/FBSDKCoreKit.framework/Headers/FBSDKCoreKit.h b/frameworks/FBSDKCoreKit.framework/Headers/FBSDKCoreKit.h index f81b32b..1fc9b54 100644 --- a/frameworks/FBSDKCoreKit.framework/Headers/FBSDKCoreKit.h +++ b/frameworks/FBSDKCoreKit.framework/Headers/FBSDKCoreKit.h @@ -18,39 +18,87 @@ #import <UIKit/UIKit.h> -#import <FBSDKCoreKit/FBSDKAccessToken.h> -#import <FBSDKCoreKit/FBSDKAppEvents.h> -#import <FBSDKCoreKit/FBSDKApplicationDelegate.h> -#import <FBSDKCoreKit/FBSDKButton.h> -#import <FBSDKCoreKit/FBSDKConstants.h> -#import <FBSDKCoreKit/FBSDKCopying.h> -#import <FBSDKCoreKit/FBSDKGraphRequest.h> -#import <FBSDKCoreKit/FBSDKGraphRequestConnection.h> -#import <FBSDKCoreKit/FBSDKGraphRequestDataAttachment.h> -#import <FBSDKCoreKit/FBSDKSettings.h> -#import <FBSDKCoreKit/FBSDKTestUsersManager.h> -#import <FBSDKCoreKit/FBSDKUtility.h> - -#if !TARGET_OS_TV -#import <FBSDKCoreKit/FBSDKAppLink.h> -#import <FBSDKCoreKit/FBSDKAppLinkNavigation.h> -#import <FBSDKCoreKit/FBSDKAppLinkResolver.h> -#import <FBSDKCoreKit/FBSDKAppLinkResolving.h> -#import <FBSDKCoreKit/FBSDKAppLinkReturnToRefererController.h> -#import <FBSDKCoreKit/FBSDKAppLinkReturnToRefererView.h> -#import <FBSDKCoreKit/FBSDKAppLinkTarget.h> -#import <FBSDKCoreKit/FBSDKAppLinkUtility.h> -#import <FBSDKCoreKit/FBSDKGraphErrorRecoveryProcessor.h> -#import <FBSDKCoreKit/FBSDKMeasurementEvent.h> -#import <FBSDKCoreKit/FBSDKMutableCopying.h> -#import <FBSDKCoreKit/FBSDKProfile.h> -#import <FBSDKCoreKit/FBSDKProfilePictureView.h> -#import <FBSDKCoreKit/FBSDKURL.h> -#import <FBSDKCoreKit/FBSDKWebViewAppLinkResolver.h> -#else -#import <FBSDKCoreKit/FBSDKDeviceButton.h> -#import <FBSDKCoreKit/FBSDKDeviceViewControllerBase.h> +#if TARGET_OS_TV + #ifndef DEVICE_SHARING_DEPRECATED + #define DEVICE_SHARING_DEPRECATED DEPRECATED_MSG_ATTRIBUTE("Sharing from devices will no longer work as of Nov 2nd 2020") + #endif #endif -#define FBSDK_VERSION_STRING @"5.6.0" -#define FBSDK_TARGET_PLATFORM_VERSION @"v4.0" +#ifdef BUCK + + #import <FBSDKCoreKit/FBSDKAccessToken.h> + #import <FBSDKCoreKit/FBSDKAppEvents.h> + #import <FBSDKCoreKit/FBSDKApplicationDelegate.h> + #import <FBSDKCoreKit/FBSDKButton.h> + #import <FBSDKCoreKit/FBSDKConstants.h> + #import <FBSDKCoreKit/FBSDKCopying.h> + #import <FBSDKCoreKit/FBSDKGraphRequest.h> + #import <FBSDKCoreKit/FBSDKGraphRequestConnection.h> + #import <FBSDKCoreKit/FBSDKGraphRequestDataAttachment.h> + #import <FBSDKCoreKit/FBSDKSettings.h> + #import <FBSDKCoreKit/FBSDKTestUsersManager.h> + #import <FBSDKCoreKit/FBSDKUtility.h> + + #if !TARGET_OS_TV + #import <FBSDKCoreKit/FBSDKAppLink.h> + #import <FBSDKCoreKit/FBSDKAppLinkNavigation.h> + #import <FBSDKCoreKit/FBSDKAppLinkResolver.h> + #import <FBSDKCoreKit/FBSDKAppLinkResolverRequestBuilder.h> + #import <FBSDKCoreKit/FBSDKAppLinkResolving.h> + #import <FBSDKCoreKit/FBSDKAppLinkReturnToRefererController.h> + #import <FBSDKCoreKit/FBSDKAppLinkReturnToRefererView.h> + #import <FBSDKCoreKit/FBSDKAppLinkTarget.h> + #import <FBSDKCoreKit/FBSDKAppLinkUtility.h> + #import <FBSDKCoreKit/FBSDKGraphErrorRecoveryProcessor.h> + #import <FBSDKCoreKit/FBSDKMeasurementEvent.h> + #import <FBSDKCoreKit/FBSDKMutableCopying.h> + #import <FBSDKCoreKit/FBSDKProfile.h> + #import <FBSDKCoreKit/FBSDKProfilePictureView.h> + #import <FBSDKCoreKit/FBSDKURL.h> + #import <FBSDKCoreKit/FBSDKWebViewAppLinkResolver.h> + #else + #import <FBSDKCoreKit/FBSDKDeviceButton.h> + #import <FBSDKCoreKit/FBSDKDeviceViewControllerBase.h> + #endif + +#else + + #import "FBSDKAccessToken.h" + #import "FBSDKAppEvents.h" + #import "FBSDKApplicationDelegate.h" + #import "FBSDKButton.h" + #import "FBSDKConstants.h" + #import "FBSDKCopying.h" + #import "FBSDKGraphRequest.h" + #import "FBSDKGraphRequestConnection.h" + #import "FBSDKGraphRequestDataAttachment.h" + #import "FBSDKSettings.h" + #import "FBSDKTestUsersManager.h" + #import "FBSDKUtility.h" + + #if !TARGET_OS_TV + #import "FBSDKAppLink.h" + #import "FBSDKAppLinkNavigation.h" + #import "FBSDKAppLinkResolver.h" + #import "FBSDKAppLinkResolverRequestBuilder.h" + #import "FBSDKAppLinkResolving.h" + #import "FBSDKAppLinkReturnToRefererController.h" + #import "FBSDKAppLinkReturnToRefererView.h" + #import "FBSDKAppLinkTarget.h" + #import "FBSDKAppLinkUtility.h" + #import "FBSDKGraphErrorRecoveryProcessor.h" + #import "FBSDKMeasurementEvent.h" + #import "FBSDKMutableCopying.h" + #import "FBSDKProfile.h" + #import "FBSDKProfilePictureView.h" + #import "FBSDKURL.h" + #import "FBSDKWebViewAppLinkResolver.h" + #else + #import "FBSDKDeviceButton.h" + #import "FBSDKDeviceViewControllerBase.h" + #endif + +#endif + +#define FBSDK_VERSION_STRING @"8.2.0" +#define FBSDK_TARGET_PLATFORM_VERSION @"v8.0" diff --git a/frameworks/FBSDKCoreKit.framework/Headers/FBSDKGraphErrorRecoveryProcessor.h b/frameworks/FBSDKCoreKit.framework/Headers/FBSDKGraphErrorRecoveryProcessor.h index 465c6ab..e57c797 100644 --- a/frameworks/FBSDKCoreKit.framework/Headers/FBSDKGraphErrorRecoveryProcessor.h +++ b/frameworks/FBSDKCoreKit.framework/Headers/FBSDKGraphErrorRecoveryProcessor.h @@ -16,9 +16,17 @@ // 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 "TargetConditionals.h" + +#if !TARGET_OS_TV + #import <Foundation/Foundation.h> +#ifdef BUCK +#import <FBSDKCoreKit/FBSDKConstants.h> +#else #import "FBSDKConstants.h" +#endif NS_ASSUME_NONNULL_BEGIN @@ -112,3 +120,5 @@ @end NS_ASSUME_NONNULL_END + +#endif diff --git a/frameworks/FBSDKCoreKit.framework/Headers/FBSDKGraphRequest.h b/frameworks/FBSDKCoreKit.framework/Headers/FBSDKGraphRequest.h index 802620c..28f8581 100644 --- a/frameworks/FBSDKCoreKit.framework/Headers/FBSDKGraphRequest.h +++ b/frameworks/FBSDKCoreKit.framework/Headers/FBSDKGraphRequest.h @@ -18,7 +18,7 @@ #import <Foundation/Foundation.h> -#import <FBSDKCoreKit/FBSDKGraphRequestConnection.h> +#import "FBSDKGraphRequestConnection.h" NS_ASSUME_NONNULL_BEGIN diff --git a/frameworks/FBSDKCoreKit.framework/Headers/FBSDKGraphRequestConnection.h b/frameworks/FBSDKCoreKit.framework/Headers/FBSDKGraphRequestConnection.h index 6dc8057..bdab4dc 100644 --- a/frameworks/FBSDKCoreKit.framework/Headers/FBSDKGraphRequestConnection.h +++ b/frameworks/FBSDKCoreKit.framework/Headers/FBSDKGraphRequestConnection.h @@ -184,7 +184,7 @@ The property is nil until the request completes. If there was a response then this property will be non-nil during the FBSDKGraphRequestBlock callback. */ -@property (nonatomic, retain, readonly) NSHTTPURLResponse *urlResponse; +@property (nonatomic, retain, readonly, nullable) NSHTTPURLResponse *urlResponse; /** Determines the operation queue that is used to call methods on the connection's delegate. @@ -257,7 +257,7 @@ to allow for using the request's response in a subsequent request. */ - (void)addRequest:(FBSDKGraphRequest *)request - batchParameters:(NSDictionary<NSString *, id> *)batchParameters + batchParameters:(nullable NSDictionary<NSString *, id> *)batchParameters completionHandler:(FBSDKGraphRequestBlock)handler; /** diff --git a/frameworks/FBSDKCoreKit.framework/Headers/FBSDKMeasurementEvent.h b/frameworks/FBSDKCoreKit.framework/Headers/FBSDKMeasurementEvent.h index 85974a8..7bd2da9 100644 --- a/frameworks/FBSDKCoreKit.framework/Headers/FBSDKMeasurementEvent.h +++ b/frameworks/FBSDKCoreKit.framework/Headers/FBSDKMeasurementEvent.h @@ -16,6 +16,10 @@ // 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 "TargetConditionals.h" + +#if !TARGET_OS_TV + #import <Foundation/Foundation.h> NS_ASSUME_NONNULL_BEGIN @@ -73,3 +77,5 @@ @end NS_ASSUME_NONNULL_END + +#endif diff --git a/frameworks/FBSDKCoreKit.framework/Headers/FBSDKMutableCopying.h b/frameworks/FBSDKCoreKit.framework/Headers/FBSDKMutableCopying.h index edaae96..7efaeeb 100644 --- a/frameworks/FBSDKCoreKit.framework/Headers/FBSDKMutableCopying.h +++ b/frameworks/FBSDKCoreKit.framework/Headers/FBSDKMutableCopying.h @@ -16,9 +16,13 @@ // 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 "TargetConditionals.h" + +#if !TARGET_OS_TV + #import <Foundation/Foundation.h> -#import <FBSDKCoreKit/FBSDKCopying.h> +#import "FBSDKCopying.h" NS_ASSUME_NONNULL_BEGIN @@ -39,3 +43,5 @@ @end NS_ASSUME_NONNULL_END + +#endif diff --git a/frameworks/FBSDKCoreKit.framework/Headers/FBSDKProfile.h b/frameworks/FBSDKCoreKit.framework/Headers/FBSDKProfile.h index af8095d..d1b1551 100644 --- a/frameworks/FBSDKCoreKit.framework/Headers/FBSDKProfile.h +++ b/frameworks/FBSDKCoreKit.framework/Headers/FBSDKProfile.h @@ -16,6 +16,10 @@ // 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 "TargetConditionals.h" + +#if !TARGET_OS_TV + #import "FBSDKProfilePictureView.h" @class FBSDKProfile; @@ -189,3 +193,5 @@ @end NS_ASSUME_NONNULL_END + +#endif diff --git a/frameworks/FBSDKCoreKit.framework/Headers/FBSDKProfilePictureView.h b/frameworks/FBSDKCoreKit.framework/Headers/FBSDKProfilePictureView.h index 1ed2b76..cbef2ce 100644 --- a/frameworks/FBSDKCoreKit.framework/Headers/FBSDKProfilePictureView.h +++ b/frameworks/FBSDKCoreKit.framework/Headers/FBSDKProfilePictureView.h @@ -16,7 +16,13 @@ // 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 "TargetConditionals.h" + +#if !TARGET_OS_TV + #import <UIKit/UIKit.h> + +@class FBSDKProfile; NS_ASSUME_NONNULL_BEGIN @@ -34,6 +40,18 @@ The original picture's aspect ratio will be used for the source image in the view. */ FBSDKProfilePictureModeNormal, + /** + The original picture's aspect ratio will be used for the source image in the view. + */ + FBSDKProfilePictureModeAlbum, + /** + The original picture's aspect ratio will be used for the source image in the view. + */ + FBSDKProfilePictureModeSmall, + /** + The original picture's aspect ratio will be used for the source image in the view. + */ + FBSDKProfilePictureModeLarge, } NS_SWIFT_NAME(Profile.PictureMode); /** @@ -41,6 +59,22 @@ */ NS_SWIFT_NAME(FBProfilePictureView) @interface FBSDKProfilePictureView : UIView + +/** + Create a new instance of `FBSDKProfilePictureView`. + + - Parameter frame: Frame rectangle for the view. + - Parameter profile: Optional profile to display a picture for. + */ +- (instancetype)initWithFrame:(CGRect)frame + profile:(FBSDKProfile * _Nullable)profile; + +/** + Create a new instance of `FBSDKProfilePictureView`. + + - Parameter profile: Optional profile to display a picture for. + */ +- (instancetype)initWithProfile:(FBSDKProfile * _Nullable)profile; /** The mode for the receiver to determine the aspect ratio of the source image. @@ -63,3 +97,5 @@ @end NS_ASSUME_NONNULL_END + +#endif diff --git a/frameworks/FBSDKCoreKit.framework/Headers/FBSDKSettings.h b/frameworks/FBSDKCoreKit.framework/Headers/FBSDKSettings.h index 2636810..86ee277 100644 --- a/frameworks/FBSDKCoreKit.framework/Headers/FBSDKSettings.h +++ b/frameworks/FBSDKCoreKit.framework/Headers/FBSDKSettings.h @@ -89,14 +89,8 @@ Controls sdk auto initailization. If not explicitly set, the default is true */ -@property (class, nonatomic, assign, getter=isAutoInitEnabled) BOOL autoInitEnabled; - -/** - Controls sdk crash report - If not explicitly set, the default is true - */ -@property (class, nonatomic, assign, getter=isInstrumentEnabled) BOOL instrumentEnabled -__attribute((deprecated("This attribute is no longer used, use autoLogAppEventsEnabled instead."))); +@property (class, nonatomic, assign, getter=isAutoInitEnabled) BOOL autoInitEnabled +DEPRECATED_MSG_ATTRIBUTE("Auto-initialization will be removed in the next major version release."); /** Controls the auto logging of basic app events, such as activateApp and deactivateApp. @@ -111,7 +105,7 @@ @property (class, nonatomic, assign, getter=isCodelessDebugLogEnabled) BOOL codelessDebugLogEnabled; /** - Controls the fb_codeless_debug logging event + Controls the access to IDFA If not explicitly set, the default is true */ @property (class, nonatomic, assign, getter=isAdvertiserIDCollectionEnabled) BOOL advertiserIDCollectionEnabled; @@ -133,14 +127,14 @@ If not explicitly set, the default will be read from the application's plist (FacebookAppID). */ -@property (class, nonatomic, copy, null_resettable) NSString *appID; +@property (class, nonatomic, copy, nullable) NSString *appID; /** The default url scheme suffix used for sessions. If not explicitly set, the default will be read from the application's plist (FacebookUrlSchemeSuffix). */ -@property (class, nonatomic, copy, null_resettable) NSString *appURLSchemeSuffix; +@property (class, nonatomic, copy, nullable) NSString *appURLSchemeSuffix; /** The Client Token that has been set via [FBSDKSettings setClientToken]. @@ -151,7 +145,7 @@ If not explicitly set, the default will be read from the application's plist (FacebookClientToken). */ -@property (class, nonatomic, copy, null_resettable) NSString *clientToken; +@property (class, nonatomic, copy, nullable) NSString *clientToken; /** The Facebook Display Name used by the SDK. @@ -161,7 +155,7 @@ If not explicitly set, the default will be read from the application's plist (FacebookDisplayName). */ -@property (class, nonatomic, copy, null_resettable) NSString *displayName; +@property (class, nonatomic, copy, nullable) NSString *displayName; /** The Facebook domain part. This can be used to change the Facebook domain @@ -169,7 +163,7 @@ If not explicitly set, the default will be read from the application's plist (FacebookDomainPart). */ -@property (class, nonatomic, copy, null_resettable) NSString *facebookDomainPart; +@property (class, nonatomic, copy, nullable) NSString *facebookDomainPart; /** The current Facebook SDK logging behavior. This should consist of strings @@ -195,6 +189,38 @@ @property (class, nonatomic, copy, null_resettable) NSString *graphAPIVersion; /** + The value of the flag advertiser_tracking_enabled that controls the advertiser tracking status of the data sent to Facebook + If not explicitly set in iOS14 or above, the default is false in iOS14 or above. + */ ++ (BOOL)isAdvertiserTrackingEnabled; + +/** +Set the advertiser_tracking_enabled flag. It only works in iOS14 and above. + +@param advertiserTrackingEnabled the value of the flag +@return Whether the the value is set successfully. It will always return NO in iOS 13 and below. + */ ++ (BOOL)setAdvertiserTrackingEnabled:(BOOL)advertiserTrackingEnabled; + +/** +Set the data processing options. + +@param options list of options +*/ ++ (void)setDataProcessingOptions:(nullable NSArray<NSString *> *)options; + +/** +Set the data processing options. + +@param options list of the options +@param country code of the country +@param state code of the state +*/ ++ (void)setDataProcessingOptions:(nullable NSArray<NSString *> *)options + country:(int)country + state:(int)state; + +/** Enable a particular Facebook SDK logging behavior. @param loggingBehavior The LoggingBehavior to enable. This should be a string defined as a constant with FBSDKLoggingBehavior*. diff --git a/frameworks/FBSDKCoreKit.framework/Headers/FBSDKURL.h b/frameworks/FBSDKCoreKit.framework/Headers/FBSDKURL.h index c7b0b0e..969d8e0 100644 --- a/frameworks/FBSDKCoreKit.framework/Headers/FBSDKURL.h +++ b/frameworks/FBSDKCoreKit.framework/Headers/FBSDKURL.h @@ -16,6 +16,10 @@ // 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 "TargetConditionals.h" + +#if !TARGET_OS_TV + #import <Foundation/Foundation.h> NS_ASSUME_NONNULL_BEGIN @@ -88,6 +92,13 @@ */ @property (nonatomic, strong, readonly) NSDictionary<NSString *, id> *inputQueryParameters; +/** + The flag indicating whether the URL comes from auto app link +*/ +@property (nonatomic, readonly, getter=isAutoAppLink) BOOL isAutoAppLink; + @end NS_ASSUME_NONNULL_END + +#endif diff --git a/frameworks/FBSDKCoreKit.framework/Headers/FBSDKWebViewAppLinkResolver.h b/frameworks/FBSDKCoreKit.framework/Headers/FBSDKWebViewAppLinkResolver.h index 69fd2b5..4ba20cc 100644 --- a/frameworks/FBSDKCoreKit.framework/Headers/FBSDKWebViewAppLinkResolver.h +++ b/frameworks/FBSDKCoreKit.framework/Headers/FBSDKWebViewAppLinkResolver.h @@ -16,6 +16,10 @@ // 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 "TargetConditionals.h" + +#if !TARGET_OS_TV + #import <Foundation/Foundation.h> #import "FBSDKAppLinkResolving.h" @@ -38,3 +42,5 @@ @end NS_ASSUME_NONNULL_END + +#endif diff --git a/frameworks/FBSDKCoreKit.framework/Info.plist b/frameworks/FBSDKCoreKit.framework/Info.plist index 45cc69f..6d59075 100644 --- a/frameworks/FBSDKCoreKit.framework/Info.plist +++ b/frameworks/FBSDKCoreKit.framework/Info.plist Binary files differ diff --git a/frameworks/FBSDKLoginKit.framework/FBSDKLoginKit b/frameworks/FBSDKLoginKit.framework/FBSDKLoginKit index 751e30d..5b22b5a 100644 --- a/frameworks/FBSDKLoginKit.framework/FBSDKLoginKit +++ b/frameworks/FBSDKLoginKit.framework/FBSDKLoginKit Binary files differ diff --git a/frameworks/FBSDKShareKit.framework/Headers/FBSDKShareMessengerActionButton.h b/frameworks/FBSDKLoginKit.framework/Headers/FBSDKCoreKitImport.h similarity index 65% copy from frameworks/FBSDKShareKit.framework/Headers/FBSDKShareMessengerActionButton.h copy to frameworks/FBSDKLoginKit.framework/Headers/FBSDKCoreKitImport.h index 710a600..aa0979d 100644 --- a/frameworks/FBSDKShareKit.framework/Headers/FBSDKShareMessengerActionButton.h +++ b/frameworks/FBSDKLoginKit.framework/Headers/FBSDKCoreKitImport.h @@ -16,26 +16,15 @@ // 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 <Foundation/Foundation.h> +// Importing FBSDKCoreKit is tricky due to build variants. +// SPM require that it is imported as <FBSDKCoreKit.h> while CocoaPods, +// Carthage, Buck, and xcodebuild require <FBSDKCoreKit/FBSDKCoreKit.h> +// This file is not exposed via SPM so non SPM users will use <FBSDKCoreKit/FBSDKCoreKit.h> -#import <FBSDKCoreKit/FBSDKCopying.h> -#import <FBSDKShareKit/FBSDKShareConstants.h> - -NS_ASSUME_NONNULL_BEGIN - -/** - A base interface for Messenger share action buttons. - */ -DEPRECATED_FOR_MESSENGER -NS_SWIFT_NAME(ShareMessengerActionButton) -@protocol FBSDKShareMessengerActionButton <FBSDKCopying, NSSecureCoding> - -/** - The title displayed to the user for the button. - @return The title for the button. - */ -@property (nonatomic, copy) NSString *title; - -@end - -NS_ASSUME_NONNULL_END +// Even though this file is not available from projects using SPM, +// it is available when building the packages themselves so we need to include this check. +#if FBSDK_SWIFT_PACKAGE + #import <FBSDKCoreKit.h> +#else + #import <FBSDKCoreKit/FBSDKCoreKit.h> +#endif diff --git a/frameworks/FBSDKLoginKit.framework/Headers/FBSDKDeviceLoginManager.h b/frameworks/FBSDKLoginKit.framework/Headers/FBSDKDeviceLoginManager.h index 1eca082..b4e483a 100644 --- a/frameworks/FBSDKLoginKit.framework/Headers/FBSDKDeviceLoginManager.h +++ b/frameworks/FBSDKLoginKit.framework/Headers/FBSDKDeviceLoginManager.h @@ -18,8 +18,8 @@ #import <Foundation/Foundation.h> -#import <FBSDKLoginKit/FBSDKDeviceLoginCodeInfo.h> -#import <FBSDKLoginKit/FBSDKDeviceLoginManagerResult.h> +#import "FBSDKDeviceLoginCodeInfo.h" +#import "FBSDKDeviceLoginManagerResult.h" NS_ASSUME_NONNULL_BEGIN diff --git a/frameworks/FBSDKLoginKit.framework/Headers/FBSDKDeviceLoginManagerResult.h b/frameworks/FBSDKLoginKit.framework/Headers/FBSDKDeviceLoginManagerResult.h index 786f11b..3124c0f 100644 --- a/frameworks/FBSDKLoginKit.framework/Headers/FBSDKDeviceLoginManagerResult.h +++ b/frameworks/FBSDKLoginKit.framework/Headers/FBSDKDeviceLoginManagerResult.h @@ -18,7 +18,11 @@ #import <Foundation/Foundation.h> +#ifdef FBSDKCOCOAPODS #import <FBSDKCoreKit/FBSDKAccessToken.h> +#endif + +@class FBSDKAccessToken; NS_ASSUME_NONNULL_BEGIN diff --git a/frameworks/FBSDKLoginKit.framework/Headers/FBSDKLoginButton.h b/frameworks/FBSDKLoginKit.framework/Headers/FBSDKLoginButton.h index 577d636..c3adca5 100644 --- a/frameworks/FBSDKLoginKit.framework/Headers/FBSDKLoginButton.h +++ b/frameworks/FBSDKLoginKit.framework/Headers/FBSDKLoginButton.h @@ -18,10 +18,21 @@ #import <UIKit/UIKit.h> -#import <FBSDKCoreKit/FBSDKButton.h> +#import "TargetConditionals.h" -#import <FBSDKLoginKit/FBSDKLoginManager.h> +#if TARGET_OS_TV +@interface FBLoginButton : UIView + +@property (copy, nonatomic) NSArray<NSString *> *permissions; + +@end + +#else + +#import "FBSDKCoreKitImport.h" + +#import "FBSDKLoginManager.h" #import "FBSDKTooltipView.h" NS_ASSUME_NONNULL_BEGIN @@ -68,12 +79,6 @@ Gets or sets the delegate. */ @property (weak, nonatomic) IBOutlet id<FBSDKLoginButtonDelegate> delegate; -/** - Gets or sets the login behavior to use - */ -@property (assign, nonatomic) FBSDKLoginBehavior loginBehavior -DEPRECATED_MSG_ATTRIBUTE("All login flows utilize the browser. This will be removed in the next major release"); - /*! @abstract The permissions to request. @discussion To provide the best experience, you should minimize the number of permissions you request, and only ask for them when needed. @@ -131,3 +136,5 @@ @end NS_ASSUME_NONNULL_END + +#endif diff --git a/frameworks/FBSDKLoginKit.framework/Headers/FBSDKLoginKit.h b/frameworks/FBSDKLoginKit.framework/Headers/FBSDKLoginKit.h index aafc577..7ae9c67 100644 --- a/frameworks/FBSDKLoginKit.framework/Headers/FBSDKLoginKit.h +++ b/frameworks/FBSDKLoginKit.framework/Headers/FBSDKLoginKit.h @@ -18,14 +18,17 @@ #import <UIKit/UIKit.h> -#import <FBSDKLoginKit/FBSDKDeviceLoginCodeInfo.h> -#import <FBSDKLoginKit/FBSDKDeviceLoginManager.h> -#import <FBSDKLoginKit/FBSDKDeviceLoginManagerResult.h> -#import <FBSDKLoginKit/FBSDKLoginConstants.h> +#import "FBSDKCoreKitImport.h" +#import "FBSDKDeviceLoginCodeInfo.h" +#import "FBSDKDeviceLoginManager.h" +#import "FBSDKDeviceLoginManagerResult.h" +#import "FBSDKLoginConstants.h" -#if !TARGET_TV_OS -#import <FBSDKLoginKit/FBSDKLoginButton.h> -#import <FBSDKLoginKit/FBSDKLoginManager.h> -#import <FBSDKLoginKit/FBSDKLoginManagerLoginResult.h> -#import <FBSDKLoginKit/FBSDKLoginTooltipView.h> +#if !TARGET_OS_TV + #import "FBSDKLoginButton.h" + #import "FBSDKLoginManager.h" + #import "FBSDKLoginManagerLoginResult.h" + #import "FBSDKLoginTooltipView.h" + #import "FBSDKReferralManager.h" + #import "FBSDKReferralManagerResult.h" #endif diff --git a/frameworks/FBSDKLoginKit.framework/Headers/FBSDKLoginManager.h b/frameworks/FBSDKLoginKit.framework/Headers/FBSDKLoginManager.h index 78a7b06..7e8de23 100644 --- a/frameworks/FBSDKLoginKit.framework/Headers/FBSDKLoginManager.h +++ b/frameworks/FBSDKLoginKit.framework/Headers/FBSDKLoginManager.h @@ -16,10 +16,41 @@ // 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 <Foundation/Foundation.h> #import <UIKit/UIKit.h> NS_ASSUME_NONNULL_BEGIN + +#if TARGET_OS_TV + +// This is an unfortunate hack for Swift Package Manager support. +// SPM does not allow us to conditionally exclude Swift files for compilation by platform. +// +// So to support tvOS with SPM we need to use runtime availability checks in the Swift files. +// This means that even though the code in `LoginManager.swift` will never be run for tvOS +// targets, it still needs to be able to compile. Hence we need to declare it here. +// +// The way to fix this is to remove extensions of ObjC types in Swift. + +@class LoginManagerLoginResult; + +typedef NS_ENUM(NSUInteger, LoginBehavior) { LoginBehaviorBrowser }; +typedef NS_ENUM(NSUInteger, DefaultAudience) { DefaultAudienceFriends }; +typedef void (^LoginManagerLoginResultBlock)(LoginManagerLoginResult *_Nullable result, + NSError *_Nullable error); + +@interface LoginManager : NSObject + +@property (assign, nonatomic) LoginBehavior loginBehavior; +@property (assign, nonatomic) DefaultAudience defaultAudience; + +- (void)logInWithPermissions:(NSArray<NSString *> *)permissions + fromViewController:(nullable UIViewController *)fromViewController + handler:(nullable LoginManagerLoginResultBlock)handler +NS_SWIFT_NAME(logIn(permissions:from:handler:)); + +@end + +#else @class FBSDKLoginManagerLoginResult; @@ -65,33 +96,6 @@ } NS_SWIFT_NAME(DefaultAudience); /** - FBSDKLoginBehavior enum - - Passed to the \c FBSDKLoginManager to indicate how Facebook Login should be attempted. - - - - Facebook Login authorizes the application to act on behalf of the user, using the user's - Facebook account. Usually a Facebook Login will rely on an account maintained outside of - the application, by the native Facebook application, the browser, or perhaps the device - itself. This avoids the need for a user to enter their username and password directly, and - provides the most secure and lowest friction way for a user to authorize the application to - interact with Facebook. - - The \c FBSDKLoginBehavior enum specifies which log-in methods may be used. The SDK - will determine the best behavior based on the current device (such as iOS version). - */ -typedef NS_ENUM(NSUInteger, FBSDKLoginBehavior) -{ - /** - This is the default behavior, and indicates logging in via ASWebAuthenticationSession (iOS 12+) or SFAuthenticationSession (iOS 11), - which present specialized SafariViewControllers. Falls back to plain SFSafariViewController (iOS 9 and 10) or Safari (iOS 8). - */ - FBSDKLoginBehaviorBrowser = 0, -} NS_SWIFT_NAME(LoginBehavior) -DEPRECATED_MSG_ATTRIBUTE("All login flows utilize the browser. This will be removed in the next major release"); - -/** `FBSDKLoginManager` provides methods for logging the user in and out. `FBSDKLoginManager` works directly with `[FBSDKAccessToken currentAccessToken]` and @@ -118,12 +122,6 @@ @property (assign, nonatomic) FBSDKDefaultAudience defaultAudience; /** - the login behavior - */ -@property (assign, nonatomic) FBSDKLoginBehavior loginBehavior -DEPRECATED_MSG_ATTRIBUTE("All login flows utilize the browser. This will be removed in the next major release"); - -/** Logs the user in or authorizes additional permissions. @param permissions the optional array of permissions. Note this is converted to NSSet and is only an NSArray for the convenience of literal syntax. @@ -145,6 +143,17 @@ fromViewController:(nullable UIViewController *)fromViewController handler:(nullable FBSDKLoginManagerLoginResultBlock)handler NS_SWIFT_NAME(logIn(permissions:from:handler:)); + +/** + Logs the user in with the given deep link url. Will only log user in if the given url contains valid login data. + @param url the deep link url + @param handler the callback. + + This method should be called with the url from the openURL method. + */ +- (void)logInWithURL:(NSURL *)url + handler:(nullable FBSDKLoginManagerLoginResultBlock)handler +NS_SWIFT_NAME(logIn(url:handler:)); /** Requests user's permission to reathorize application's data access, after it has expired due to inactivity. @@ -170,4 +179,6 @@ @end +#endif + NS_ASSUME_NONNULL_END diff --git a/frameworks/FBSDKLoginKit.framework/Headers/FBSDKLoginManagerLoginResult.h b/frameworks/FBSDKLoginKit.framework/Headers/FBSDKLoginManagerLoginResult.h index ffcaaae..d87d0f6 100644 --- a/frameworks/FBSDKLoginKit.framework/Headers/FBSDKLoginManagerLoginResult.h +++ b/frameworks/FBSDKLoginKit.framework/Headers/FBSDKLoginManagerLoginResult.h @@ -20,6 +20,28 @@ NS_ASSUME_NONNULL_BEGIN +#if TARGET_OS_TV + +// This is an unfortunate hack for Swift Package Manager support. +// SPM does not allow us to conditionally exclude Swift files for compilation by platform. +// +// So to support tvOS with SPM we need to use runtime availability checks in the Swift files. +// This means that even though the code in `LoginManager.swift` will never be run for tvOS +// targets, it still needs to be able to compile. Hence we need to declare it here. +// +// The way to fix this is to remove extensions of ObjC types in Swift. + +@interface LoginManagerLoginResult : NSObject + +@property (copy, nonatomic, nullable) FBSDKAccessToken *token; +@property (readonly, nonatomic) BOOL isCancelled; +@property (copy, nonatomic) NSSet<NSString *> *grantedPermissions; +@property (copy, nonatomic) NSSet<NSString *> *declinedPermissions; + +@end + +#else + @class FBSDKAccessToken; /** @@ -69,4 +91,6 @@ NS_DESIGNATED_INITIALIZER; @end +#endif + NS_ASSUME_NONNULL_END diff --git a/frameworks/FBSDKLoginKit.framework/Headers/FBSDKLoginTooltipView.h b/frameworks/FBSDKLoginKit.framework/Headers/FBSDKLoginTooltipView.h index 63f9e32..1e03eea 100644 --- a/frameworks/FBSDKLoginKit.framework/Headers/FBSDKLoginTooltipView.h +++ b/frameworks/FBSDKLoginKit.framework/Headers/FBSDKLoginTooltipView.h @@ -16,9 +16,13 @@ // 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 "TargetConditionals.h" + +#if !TARGET_OS_TV + #import <UIKit/UIKit.h> -#import <FBSDKLoginKit/FBSDKTooltipView.h> +#import "FBSDKTooltipView.h" NS_ASSUME_NONNULL_BEGIN @@ -94,3 +98,5 @@ @end NS_ASSUME_NONNULL_END + +#endif diff --git a/frameworks/FBSDKShareKit.framework/Headers/FBSDKShareMessengerActionButton.h b/frameworks/FBSDKLoginKit.framework/Headers/FBSDKReferralCode.h similarity index 66% rename from frameworks/FBSDKShareKit.framework/Headers/FBSDKShareMessengerActionButton.h rename to frameworks/FBSDKLoginKit.framework/Headers/FBSDKReferralCode.h index 710a600..05ab81a 100644 --- a/frameworks/FBSDKShareKit.framework/Headers/FBSDKShareMessengerActionButton.h +++ b/frameworks/FBSDKLoginKit.framework/Headers/FBSDKReferralCode.h @@ -16,26 +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 <Foundation/Foundation.h> +#import "TargetConditionals.h" -#import <FBSDKCoreKit/FBSDKCopying.h> -#import <FBSDKShareKit/FBSDKShareConstants.h> +#if !TARGET_OS_TV + +#import <Foundation/Foundation.h> NS_ASSUME_NONNULL_BEGIN /** - A base interface for Messenger share action buttons. - */ -DEPRECATED_FOR_MESSENGER -NS_SWIFT_NAME(ShareMessengerActionButton) -@protocol FBSDKShareMessengerActionButton <FBSDKCopying, NSSecureCoding> + Represent a referral code used in the referral process +*/ +NS_SWIFT_NAME(ReferralCode) +@interface FBSDKReferralCode : NSObject + +- (instancetype)init NS_UNAVAILABLE; ++ (instancetype)new NS_UNAVAILABLE; /** - The title displayed to the user for the button. - @return The title for the button. - */ -@property (nonatomic, copy) NSString *title; + The string value of the referral code +*/ +@property NSString *value; + +/** + Initializes a new instance if the referral code is valid. Otherwise returns nil. + A code is valid if it is non-empty and contains only alphanumeric characters. + @param string the raw string referral code +*/ ++ (nullable instancetype)initWithString:(NSString *)string; @end NS_ASSUME_NONNULL_END + +#endif diff --git a/frameworks/FBSDKLoginKit.framework/Headers/FBSDKReferralManager.h b/frameworks/FBSDKLoginKit.framework/Headers/FBSDKReferralManager.h new file mode 100644 index 0000000..f923d54 --- /dev/null +++ b/frameworks/FBSDKLoginKit.framework/Headers/FBSDKReferralManager.h @@ -0,0 +1,60 @@ +// 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 "TargetConditionals.h" + +#if !TARGET_OS_TV + +#import <UIKit/UIKit.h> + +NS_ASSUME_NONNULL_BEGIN + +@class FBSDKReferralManagerResult; + +/** + Describes the call back to the FBSDKReferralManager + @param result the result of the referral + @param error the referral error, if any. + */ +typedef void (^FBSDKReferralManagerResultBlock)(FBSDKReferralManagerResult *_Nullable result, + NSError *_Nullable error) +NS_SWIFT_NAME(ReferralManagerResultBlock); + +/** + `FBSDKReferralManager` provides methods for starting the referral process. +*/ +NS_SWIFT_NAME(ReferralManager) +@interface FBSDKReferralManager : NSObject + +/** + Initialize a new instance with the provided view controller + @param viewController the view controller to present from. If nil, the topmost view controller will be automatically determined as best as possible. + */ +- (instancetype)initWithViewController:(nullable UIViewController *)viewController; + +/** + Open the referral dialog. + @param handler the callback. + */ +-(void)startReferralWithCompletionHandler:(nullable FBSDKReferralManagerResultBlock)handler; + +@end + +NS_ASSUME_NONNULL_END + +#endif diff --git a/frameworks/FBSDKLoginKit.framework/Headers/FBSDKReferralManagerResult.h b/frameworks/FBSDKLoginKit.framework/Headers/FBSDKReferralManagerResult.h new file mode 100644 index 0000000..8406c30 --- /dev/null +++ b/frameworks/FBSDKLoginKit.framework/Headers/FBSDKReferralManagerResult.h @@ -0,0 +1,59 @@ +// 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 "TargetConditionals.h" + +#if !TARGET_OS_TV + +#import <Foundation/Foundation.h> + +#import "FBSDKReferralCode.h" + +NS_ASSUME_NONNULL_BEGIN + +/** + Describes the result of a referral request. + */ +NS_SWIFT_NAME(ReferralManagerResult) +@interface FBSDKReferralManagerResult : NSObject + +- (instancetype)init NS_UNAVAILABLE; ++ (instancetype)new NS_UNAVAILABLE; + +/** + whether the referral was cancelled by the user. + */ +@property (readonly, nonatomic) BOOL isCancelled; + +/** + An array of referral codes for each referral made by the user + */ +@property (copy, nonatomic) NSArray<FBSDKReferralCode *> *referralCodes; + +/** Initializes a new instance. + @param referralCodes the referral codes + @param isCancelled whether the referral was cancelled by the user + */ +- (instancetype)initWithReferralCodes:(nullable NSArray<FBSDKReferralCode *> *)referralCodes + isCancelled:(BOOL)isCancelled +NS_DESIGNATED_INITIALIZER; +@end + +NS_ASSUME_NONNULL_END + +#endif diff --git a/frameworks/FBSDKLoginKit.framework/Headers/FBSDKTooltipView.h b/frameworks/FBSDKLoginKit.framework/Headers/FBSDKTooltipView.h index 3941bcd..eee01c7 100644 --- a/frameworks/FBSDKLoginKit.framework/Headers/FBSDKTooltipView.h +++ b/frameworks/FBSDKLoginKit.framework/Headers/FBSDKTooltipView.h @@ -16,6 +16,10 @@ // 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 "TargetConditionals.h" + +#if !TARGET_OS_TV + #import <UIKit/UIKit.h> NS_ASSUME_NONNULL_BEGIN @@ -144,3 +148,5 @@ @end NS_ASSUME_NONNULL_END + +#endif diff --git a/frameworks/FBSDKLoginKit.framework/Info.plist b/frameworks/FBSDKLoginKit.framework/Info.plist index a987aab..85e0f0f 100644 --- a/frameworks/FBSDKLoginKit.framework/Info.plist +++ b/frameworks/FBSDKLoginKit.framework/Info.plist Binary files differ diff --git a/frameworks/FBSDKShareKit.framework/FBSDKShareKit b/frameworks/FBSDKShareKit.framework/FBSDKShareKit index 082f307..3e1c434 100644 --- a/frameworks/FBSDKShareKit.framework/FBSDKShareKit +++ b/frameworks/FBSDKShareKit.framework/FBSDKShareKit Binary files differ diff --git a/frameworks/FBSDKShareKit.framework/Headers/FBSDKAppGroupContent.h b/frameworks/FBSDKShareKit.framework/Headers/FBSDKAppGroupContent.h index 1c9143b..367a168 100644 --- a/frameworks/FBSDKShareKit.framework/Headers/FBSDKAppGroupContent.h +++ b/frameworks/FBSDKShareKit.framework/Headers/FBSDKAppGroupContent.h @@ -18,7 +18,16 @@ #import <Foundation/Foundation.h> -#import <FBSDKCoreKit/FBSDKCopying.h> +#if TARGET_OS_TV + +typedef NS_ENUM(NSUInteger, AppGroupPrivacy) { AppGroupPrivacyOpen }; + +FOUNDATION_EXPORT NSString *NSStringFromFBSDKAppGroupPrivacy(AppGroupPrivacy privacy) +NS_REFINED_FOR_SWIFT; + +#else + +#import "FBSDKCoreKitImport.h" NS_ASSUME_NONNULL_BEGIN @@ -71,3 +80,5 @@ @end NS_ASSUME_NONNULL_END + +#endif diff --git a/frameworks/FBSDKShareKit.framework/Headers/FBSDKAppInviteContent.h b/frameworks/FBSDKShareKit.framework/Headers/FBSDKAppInviteContent.h index 14bd9f7..b029263 100644 --- a/frameworks/FBSDKShareKit.framework/Headers/FBSDKAppInviteContent.h +++ b/frameworks/FBSDKShareKit.framework/Headers/FBSDKAppInviteContent.h @@ -16,10 +16,15 @@ // 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 "TargetConditionals.h" + +#if !TARGET_OS_TV + #import <Foundation/Foundation.h> -#import <FBSDKCoreKit/FBSDKCopying.h> -#import <FBSDKShareKit/FBSDKSharingValidation.h> +#import "FBSDKCoreKitImport.h" + +#import "FBSDKSharingValidation.h" NS_ASSUME_NONNULL_BEGIN @@ -93,3 +98,5 @@ @end NS_ASSUME_NONNULL_END + +#endif diff --git a/frameworks/FBSDKShareKit.framework/Headers/FBSDKCameraEffectArguments.h b/frameworks/FBSDKShareKit.framework/Headers/FBSDKCameraEffectArguments.h index 6c8b850..d02699e 100644 --- a/frameworks/FBSDKShareKit.framework/Headers/FBSDKCameraEffectArguments.h +++ b/frameworks/FBSDKShareKit.framework/Headers/FBSDKCameraEffectArguments.h @@ -16,9 +16,13 @@ // 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 "TargetConditionals.h" + +#if !TARGET_OS_TV + #import <Foundation/Foundation.h> -#import <FBSDKCoreKit/FBSDKCopying.h> +#import "FBSDKCoreKitImport.h" NS_ASSUME_NONNULL_BEGIN @@ -62,3 +66,5 @@ @end NS_ASSUME_NONNULL_END + +#endif diff --git a/frameworks/FBSDKShareKit.framework/Headers/FBSDKCameraEffectTextures.h b/frameworks/FBSDKShareKit.framework/Headers/FBSDKCameraEffectTextures.h index dded746..2cb6d5c 100644 --- a/frameworks/FBSDKShareKit.framework/Headers/FBSDKCameraEffectTextures.h +++ b/frameworks/FBSDKShareKit.framework/Headers/FBSDKCameraEffectTextures.h @@ -16,9 +16,13 @@ // 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 "TargetConditionals.h" + +#if !TARGET_OS_TV + #import <UIKit/UIKit.h> -#import <FBSDKCoreKit/FBSDKCopying.h> +#import "FBSDKCoreKitImport.h" NS_ASSUME_NONNULL_BEGIN @@ -47,3 +51,5 @@ @end NS_ASSUME_NONNULL_END + +#endif diff --git a/frameworks/FBSDKShareKit.framework/Headers/FBSDKShareMessengerActionButton.h b/frameworks/FBSDKShareKit.framework/Headers/FBSDKCoreKitImport.h similarity index 66% copy from frameworks/FBSDKShareKit.framework/Headers/FBSDKShareMessengerActionButton.h copy to frameworks/FBSDKShareKit.framework/Headers/FBSDKCoreKitImport.h index 710a600..aa0979d 100644 --- a/frameworks/FBSDKShareKit.framework/Headers/FBSDKShareMessengerActionButton.h +++ b/frameworks/FBSDKShareKit.framework/Headers/FBSDKCoreKitImport.h @@ -16,26 +16,15 @@ // 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 <Foundation/Foundation.h> +// Importing FBSDKCoreKit is tricky due to build variants. +// SPM require that it is imported as <FBSDKCoreKit.h> while CocoaPods, +// Carthage, Buck, and xcodebuild require <FBSDKCoreKit/FBSDKCoreKit.h> +// This file is not exposed via SPM so non SPM users will use <FBSDKCoreKit/FBSDKCoreKit.h> -#import <FBSDKCoreKit/FBSDKCopying.h> -#import <FBSDKShareKit/FBSDKShareConstants.h> - -NS_ASSUME_NONNULL_BEGIN - -/** - A base interface for Messenger share action buttons. - */ -DEPRECATED_FOR_MESSENGER -NS_SWIFT_NAME(ShareMessengerActionButton) -@protocol FBSDKShareMessengerActionButton <FBSDKCopying, NSSecureCoding> - -/** - The title displayed to the user for the button. - @return The title for the button. - */ -@property (nonatomic, copy) NSString *title; - -@end - -NS_ASSUME_NONNULL_END +// Even though this file is not available from projects using SPM, +// it is available when building the packages themselves so we need to include this check. +#if FBSDK_SWIFT_PACKAGE + #import <FBSDKCoreKit.h> +#else + #import <FBSDKCoreKit/FBSDKCoreKit.h> +#endif diff --git a/frameworks/FBSDKShareKit.framework/Headers/FBSDKGameRequestContent.h b/frameworks/FBSDKShareKit.framework/Headers/FBSDKGameRequestContent.h index 80972ed..62f4140 100644 --- a/frameworks/FBSDKShareKit.framework/Headers/FBSDKGameRequestContent.h +++ b/frameworks/FBSDKShareKit.framework/Headers/FBSDKGameRequestContent.h @@ -16,10 +16,15 @@ // 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 "TargetConditionals.h" + +#if !TARGET_OS_TV + #import <Foundation/Foundation.h> -#import <FBSDKCoreKit/FBSDKCopying.h> -#import <FBSDKShareKit/FBSDKSharingValidation.h> +#import "FBSDKCoreKitImport.h" + +#import "FBSDKSharingValidation.h" NS_ASSUME_NONNULL_BEGIN @@ -131,3 +136,5 @@ @end NS_ASSUME_NONNULL_END + +#endif diff --git a/frameworks/FBSDKShareKit.framework/Headers/FBSDKGameRequestDialog.h b/frameworks/FBSDKShareKit.framework/Headers/FBSDKGameRequestDialog.h index 05a590b..847e2f0 100644 --- a/frameworks/FBSDKShareKit.framework/Headers/FBSDKGameRequestDialog.h +++ b/frameworks/FBSDKShareKit.framework/Headers/FBSDKGameRequestDialog.h @@ -16,9 +16,13 @@ // 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 "TargetConditionals.h" + +#if !TARGET_OS_TV + #import <Foundation/Foundation.h> -#import <FBSDKShareKit/FBSDKGameRequestContent.h> +#import "FBSDKGameRequestContent.h" NS_ASSUME_NONNULL_BEGIN @@ -127,3 +131,5 @@ @end NS_ASSUME_NONNULL_END + +#endif diff --git a/frameworks/FBSDKShareKit.framework/Headers/FBSDKHashtag.h b/frameworks/FBSDKShareKit.framework/Headers/FBSDKHashtag.h index 4c640b4..dc9d766 100644 --- a/frameworks/FBSDKShareKit.framework/Headers/FBSDKHashtag.h +++ b/frameworks/FBSDKShareKit.framework/Headers/FBSDKHashtag.h @@ -18,7 +18,7 @@ #import <Foundation/Foundation.h> -#import <FBSDKCoreKit/FBSDKCopying.h> +#import "FBSDKCoreKitImport.h" NS_ASSUME_NONNULL_BEGIN diff --git a/frameworks/FBSDKShareKit.framework/Headers/FBSDKLiking.h b/frameworks/FBSDKShareKit.framework/Headers/FBSDKLiking.h index 86f6d56..028c0f9 100644 --- a/frameworks/FBSDKShareKit.framework/Headers/FBSDKLiking.h +++ b/frameworks/FBSDKShareKit.framework/Headers/FBSDKLiking.h @@ -16,6 +16,10 @@ // 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 "TargetConditionals.h" + +#if !TARGET_OS_TV + #import <Foundation/Foundation.h> #import "FBSDKLikeObjectType.h" @@ -54,3 +58,5 @@ @end NS_ASSUME_NONNULL_END + +#endif diff --git a/frameworks/FBSDKShareKit.framework/Headers/FBSDKMessageDialog.h b/frameworks/FBSDKShareKit.framework/Headers/FBSDKMessageDialog.h index 91288e2..c38dc83 100644 --- a/frameworks/FBSDKShareKit.framework/Headers/FBSDKMessageDialog.h +++ b/frameworks/FBSDKShareKit.framework/Headers/FBSDKMessageDialog.h @@ -16,10 +16,14 @@ // 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 "TargetConditionals.h" + +#if !TARGET_OS_TV + #import <Foundation/Foundation.h> -#import <FBSDKShareKit/FBSDKSharing.h> -#import <FBSDKShareKit/FBSDKShareConstants.h> +#import "FBSDKShareConstants.h" +#import "FBSDKSharing.h" NS_ASSUME_NONNULL_BEGIN @@ -28,18 +32,17 @@ SUPPORTED SHARE TYPES - FBSDKShareLinkContent - - FBSDKShareMessengerOpenGraphMusicTemplateContent - - FBSDKShareMessengerMediaTemplateContent - - FBSDKShareMessengerGenericTemplateContent UNSUPPORTED SHARE TYPES (DEPRECATED AUGUST 2018) - FBSDKShareOpenGraphContent - FBSDKSharePhotoContent - FBSDKShareVideoContent + - FBSDKShareMessengerOpenGraphMusicTemplateContent + - FBSDKShareMessengerMediaTemplateContent + - FBSDKShareMessengerGenericTemplateContent - Any other types that are not one of the four supported types listed above */ NS_SWIFT_NAME(MessageDialog) -DEPRECATED_FOR_MESSENGER @interface FBSDKMessageDialog : NSObject <FBSDKSharingDialog> /** @@ -63,3 +66,5 @@ @end NS_ASSUME_NONNULL_END + +#endif diff --git a/frameworks/FBSDKShareKit.framework/Headers/FBSDKSendButton.h b/frameworks/FBSDKShareKit.framework/Headers/FBSDKSendButton.h index 08bd5e0..e3f038d 100644 --- a/frameworks/FBSDKShareKit.framework/Headers/FBSDKSendButton.h +++ b/frameworks/FBSDKShareKit.framework/Headers/FBSDKSendButton.h @@ -16,12 +16,16 @@ // 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 "TargetConditionals.h" + +#if !TARGET_OS_TV + #import <UIKit/UIKit.h> -#import <FBSDKCoreKit/FBSDKButton.h> +#import "FBSDKCoreKitImport.h" -#import <FBSDKShareKit/FBSDKShareConstants.h> -#import <FBSDKShareKit/FBSDKSharingButton.h> +#import "FBSDKShareConstants.h" +#import "FBSDKSharingButton.h" NS_ASSUME_NONNULL_BEGIN @@ -31,10 +35,11 @@ Tapping the receiver will invoke the FBSDKShareDialog with the attached shareContent. If the dialog cannot be shown, the button will be disable. */ -DEPRECATED_FOR_MESSENGER NS_SWIFT_NAME(FBSendButton) @interface FBSDKSendButton : FBSDKButton <FBSDKSharingButton> @end NS_ASSUME_NONNULL_END + +#endif diff --git a/frameworks/FBSDKShareKit.framework/Headers/FBSDKShareAPI.h b/frameworks/FBSDKShareKit.framework/Headers/FBSDKShareAPI.h deleted file mode 100644 index 0fd038b..0000000 --- a/frameworks/FBSDKShareKit.framework/Headers/FBSDKShareAPI.h +++ /dev/null @@ -1,114 +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 <Foundation/Foundation.h> - -#import <FBSDKCoreKit/FBSDKAccessToken.h> - -#import <FBSDKShareKit/FBSDKShareOpenGraphObject.h> -#import <FBSDKShareKit/FBSDKSharing.h> - -NS_ASSUME_NONNULL_BEGIN - -/** - A utility class for sharing through the graph API. Using this class requires an access token that - has been granted the "publish_actions" permission. - - FBSDKShareAPI network requests are scheduled on the current run loop in the default run loop mode. - If you want to use FBSDKShareAPI in a background thread, you must manage the run loop - yourself. - */ -NS_SWIFT_NAME(ShareAPI) -@interface FBSDKShareAPI : NSObject <FBSDKSharing> - -- (instancetype)init NS_DESIGNATED_INITIALIZER -NS_SWIFT_UNAVAILABLE("Use init(content:delegate:) instead"); -+ (instancetype)new NS_UNAVAILABLE; - -/** - Convenience method to build up a share API with content and a delegate. - @param content The content to be shared. - @param delegate The receiver's delegate. - */ -+ (instancetype)apiWithContent:(id<FBSDKSharingContent>)content - delegate:(nullable id<FBSDKSharingDelegate>)delegate -NS_SWIFT_NAME(init(content:delegate:)); - -/** - Convenience method to build up and share a share API with content and a delegate. - @param content The content to be shared. - @param delegate The receiver's delegate. - */ -+ (instancetype)shareWithContent:(id<FBSDKSharingContent>)content - delegate:(nullable id<FBSDKSharingDelegate>)delegate -NS_SWIFT_UNAVAILABLE("Use init(content:delegate:).share() instead"); - -/** - The message the person has provided through the custom dialog that will accompany the share content. - */ -@property (nonatomic, copy, nullable) NSString *message; - -/** - The graph node to which content should be shared. - */ -@property (nonatomic, copy) NSString *graphNode; - -/** - The access token used when performing a share. The access token must have the "publish_actions" - permission granted. - - Defaults to [FBSDKAccessToken currentAccessToken]. Setting this to nil will revert the access token to - [FBSDKAccessToken currentAccessToken]. - */ -@property (nonatomic, strong, nullable) FBSDKAccessToken *accessToken; - -/** - A Boolean value that indicates whether the receiver can send the share. - - May return NO if the appropriate Facebook app is not installed and is required or an access token is - required but not available. This method does not validate the content on the receiver, so this can be checked before - building up the content. - - @see [FBSDKSharing validateWithError:] - @return YES if the receiver can send, otherwise NO. - */ -@property (nonatomic, readonly) BOOL canShare; - -/** - Creates an User Owned Open Graph object without an action. - @param openGraphObject The open graph object to create. - - Use this method to create an object alone, when an action is not going to be posted with the object. If - the object will be used within an action, just put the object in the action and share that as the shareContent and the - object will be created in the process. The delegate will be messaged with the results. - - Also see https://developers.facebook.com/docs/sharing/opengraph/object-api#objectapi-creatinguser - - @return YES if the receiver was able to send the request to create the object, otherwise NO. - */ -- (BOOL)createOpenGraphObject:(FBSDKShareOpenGraphObject *)openGraphObject; - -/** - Begins the send from the receiver. - @return YES if the receiver was able to send the share, otherwise NO. - */ -- (BOOL)share; - -@end - -NS_ASSUME_NONNULL_END diff --git a/frameworks/FBSDKShareKit.framework/Headers/FBSDKShareButton.h b/frameworks/FBSDKShareKit.framework/Headers/FBSDKShareButton.h index 2c1614a..1c5ab75 100644 --- a/frameworks/FBSDKShareKit.framework/Headers/FBSDKShareButton.h +++ b/frameworks/FBSDKShareKit.framework/Headers/FBSDKShareButton.h @@ -16,11 +16,15 @@ // 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 "TargetConditionals.h" + +#if !TARGET_OS_TV + #import <UIKit/UIKit.h> -#import <FBSDKCoreKit/FBSDKButton.h> +#import "FBSDKCoreKitImport.h" -#import <FBSDKShareKit/FBSDKSharingButton.h> +#import "FBSDKSharingButton.h" NS_ASSUME_NONNULL_BEGIN @@ -36,3 +40,5 @@ @end NS_ASSUME_NONNULL_END + +#endif diff --git a/frameworks/FBSDKShareKit.framework/Headers/FBSDKShareCameraEffectContent.h b/frameworks/FBSDKShareKit.framework/Headers/FBSDKShareCameraEffectContent.h index 5386133..4ad2e81 100644 --- a/frameworks/FBSDKShareKit.framework/Headers/FBSDKShareCameraEffectContent.h +++ b/frameworks/FBSDKShareKit.framework/Headers/FBSDKShareCameraEffectContent.h @@ -16,12 +16,16 @@ // 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 "TargetConditionals.h" + +#if !TARGET_OS_TV + #import <Foundation/Foundation.h> -#import <FBSDKShareKit/FBSDKCameraEffectArguments.h> -#import <FBSDKShareKit/FBSDKCameraEffectTextures.h> -#import <FBSDKShareKit/FBSDKSharingContent.h> -#import <FBSDKShareKit/FBSDKSharingScheme.h> +#import "FBSDKCameraEffectArguments.h" +#import "FBSDKCameraEffectTextures.h" +#import "FBSDKSharingContent.h" +#import "FBSDKSharingScheme.h" NS_ASSUME_NONNULL_BEGIN @@ -56,3 +60,5 @@ @end NS_ASSUME_NONNULL_END + +#endif diff --git a/frameworks/FBSDKShareKit.framework/Headers/FBSDKShareConstants.h b/frameworks/FBSDKShareKit.framework/Headers/FBSDKShareConstants.h index 2e7716c..c27b80c 100644 --- a/frameworks/FBSDKShareKit.framework/Headers/FBSDKShareConstants.h +++ b/frameworks/FBSDKShareKit.framework/Headers/FBSDKShareConstants.h @@ -18,10 +18,6 @@ #import <Foundation/Foundation.h> -#ifndef DEPRECATED_FOR_MESSENGER -#define DEPRECATED_FOR_MESSENGER DEPRECATED_MSG_ATTRIBUTE("Sharing to Messenger via the SDK is unsupported. https://developers.facebook.com/docs/messenger-platform/changelog/#20190610. Sharing should be performed by the native share sheet.") -#endif - NS_ASSUME_NONNULL_BEGIN #if __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_10_0 diff --git a/frameworks/FBSDKShareKit.framework/Headers/FBSDKShareDialog.h b/frameworks/FBSDKShareKit.framework/Headers/FBSDKShareDialog.h index c801344..3334523 100644 --- a/frameworks/FBSDKShareKit.framework/Headers/FBSDKShareDialog.h +++ b/frameworks/FBSDKShareKit.framework/Headers/FBSDKShareDialog.h @@ -16,11 +16,30 @@ // 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 "TargetConditionals.h" + +#if TARGET_OS_TV + +// This is an unfortunate hack for Swift Package Manager support. +// SPM does not allow us to conditionally exclude Swift files for compilation by platform. +// +// So to support tvOS with SPM we need to use runtime availability checks in the Swift files. +// This means that even though the Swift extension of ShareDialog will never be run for tvOS +// targets, it still needs to be able to compile. Hence we need to declare it here. +// +// The way to fix this is to remove extensions of ObjC types in Swift. + +NS_SWIFT_NAME(ShareDialog) +@interface FBSDKShareDialog : NSObject +@end + +#else + #import <UIKit/UIKit.h> -#import <FBSDKShareKit/FBSDKShareDialogMode.h> -#import <FBSDKShareKit/FBSDKSharing.h> -#import <FBSDKShareKit/FBSDKSharingContent.h> +#import "FBSDKShareDialogMode.h" +#import "FBSDKSharing.h" +#import "FBSDKSharingContent.h" NS_ASSUME_NONNULL_BEGIN @@ -69,3 +88,5 @@ @end NS_ASSUME_NONNULL_END + +#endif diff --git a/frameworks/FBSDKShareKit.framework/Headers/FBSDKShareKit.h b/frameworks/FBSDKShareKit.framework/Headers/FBSDKShareKit.h index 5224d17..f304c6e 100644 --- a/frameworks/FBSDKShareKit.framework/Headers/FBSDKShareKit.h +++ b/frameworks/FBSDKShareKit.framework/Headers/FBSDKShareKit.h @@ -16,43 +16,32 @@ // 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 <UIKit/UIKit.h> - -#import <FBSDKShareKit/FBSDKHashtag.h> -#import <FBSDKShareKit/FBSDKShareAPI.h> -#import <FBSDKShareKit/FBSDKShareConstants.h> -#import <FBSDKShareKit/FBSDKShareLinkContent.h> -#import <FBSDKShareKit/FBSDKShareMediaContent.h> -#import <FBSDKShareKit/FBSDKShareMessengerActionButton.h> -#import <FBSDKShareKit/FBSDKShareMessengerGenericTemplateContent.h> -#import <FBSDKShareKit/FBSDKShareMessengerGenericTemplateElement.h> -#import <FBSDKShareKit/FBSDKShareMessengerMediaTemplateContent.h> -#import <FBSDKShareKit/FBSDKShareMessengerOpenGraphMusicTemplateContent.h> -#import <FBSDKShareKit/FBSDKShareMessengerURLActionButton.h> -#import <FBSDKShareKit/FBSDKShareOpenGraphAction.h> -#import <FBSDKShareKit/FBSDKShareOpenGraphContent.h> -#import <FBSDKShareKit/FBSDKShareOpenGraphObject.h> -#import <FBSDKShareKit/FBSDKSharePhoto.h> -#import <FBSDKShareKit/FBSDKSharePhotoContent.h> -#import <FBSDKShareKit/FBSDKShareVideo.h> -#import <FBSDKShareKit/FBSDKShareVideoContent.h> -#import <FBSDKShareKit/FBSDKSharing.h> -#import <FBSDKShareKit/FBSDKSharingContent.h> +#import "FBSDKHashtag.h" +#import "FBSDKShareConstants.h" +#import "FBSDKShareLinkContent.h" +#import "FBSDKShareMediaContent.h" +#import "FBSDKSharePhoto.h" +#import "FBSDKSharePhotoContent.h" +#import "FBSDKShareVideo.h" +#import "FBSDKShareVideoContent.h" +#import "FBSDKSharing.h" +#import "FBSDKSharingContent.h" +#import "TargetConditionals.h" #if !TARGET_OS_TV -#import <FBSDKShareKit/FBSDKAppGroupContent.h> -#import <FBSDKShareKit/FBSDKAppInviteContent.h> -#import <FBSDKShareKit/FBSDKGameRequestContent.h> -#import <FBSDKShareKit/FBSDKGameRequestDialog.h> -#import <FBSDKShareKit/FBSDKLiking.h> -#import <FBSDKShareKit/FBSDKLikeObjectType.h> -#import <FBSDKShareKit/FBSDKMessageDialog.h> -#import <FBSDKShareKit/FBSDKShareButton.h> -#import <FBSDKShareKit/FBSDKShareCameraEffectContent.h> -#import <FBSDKShareKit/FBSDKShareDialog.h> -#import <FBSDKShareKit/FBSDKShareDialogMode.h> -#import <FBSDKShareKit/FBSDKSendButton.h> + #import "FBSDKAppGroupContent.h" + #import "FBSDKAppInviteContent.h" + #import "FBSDKGameRequestContent.h" + #import "FBSDKGameRequestDialog.h" + #import "FBSDKLikeObjectType.h" + #import "FBSDKLiking.h" + #import "FBSDKMessageDialog.h" + #import "FBSDKSendButton.h" + #import "FBSDKShareButton.h" + #import "FBSDKShareCameraEffectContent.h" + #import "FBSDKShareDialog.h" + #import "FBSDKShareDialogMode.h" #else -#import <FBSDKShareKit/FBSDKDeviceShareViewController.h> -#import <FBSDKShareKit/FBSDKDeviceShareButton.h> + #import "FBSDKDeviceShareButton.h" + #import "FBSDKDeviceShareViewController.h" #endif diff --git a/frameworks/FBSDKShareKit.framework/Headers/FBSDKShareLinkContent.h b/frameworks/FBSDKShareKit.framework/Headers/FBSDKShareLinkContent.h index 5b7ba5f..d4224a5 100644 --- a/frameworks/FBSDKShareKit.framework/Headers/FBSDKShareLinkContent.h +++ b/frameworks/FBSDKShareKit.framework/Headers/FBSDKShareLinkContent.h @@ -18,7 +18,7 @@ #import <Foundation/Foundation.h> -#import <FBSDKShareKit/FBSDKSharingContent.h> +#import "FBSDKSharingContent.h" NS_ASSUME_NONNULL_BEGIN diff --git a/frameworks/FBSDKShareKit.framework/Headers/FBSDKShareMediaContent.h b/frameworks/FBSDKShareKit.framework/Headers/FBSDKShareMediaContent.h index 684a504..f54c316 100644 --- a/frameworks/FBSDKShareKit.framework/Headers/FBSDKShareMediaContent.h +++ b/frameworks/FBSDKShareKit.framework/Headers/FBSDKShareMediaContent.h @@ -18,7 +18,7 @@ #import <Foundation/Foundation.h> -#import <FBSDKShareKit/FBSDKSharingContent.h> +#import "FBSDKSharingContent.h" NS_ASSUME_NONNULL_BEGIN diff --git a/frameworks/FBSDKShareKit.framework/Headers/FBSDKShareMessengerGenericTemplateContent.h b/frameworks/FBSDKShareKit.framework/Headers/FBSDKShareMessengerGenericTemplateContent.h deleted file mode 100644 index d65fd76..0000000 --- a/frameworks/FBSDKShareKit.framework/Headers/FBSDKShareMessengerGenericTemplateContent.h +++ /dev/null @@ -1,63 +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 <Foundation/Foundation.h> - -#import <FBSDKShareKit/FBSDKSharingContent.h> -#import <FBSDKShareKit/FBSDKShareConstants.h> - -NS_ASSUME_NONNULL_BEGIN - -@class FBSDKShareMessengerGenericTemplateElement; - -DEPRECATED_FOR_MESSENGER -typedef NS_ENUM(NSUInteger, FBSDKShareMessengerGenericTemplateImageAspectRatio) { - FBSDKShareMessengerGenericTemplateImageAspectRatioHorizontal = 0, - FBSDKShareMessengerGenericTemplateImageAspectRatioSquare -} NS_SWIFT_NAME(ShareMessengerGenericTemplateImageAspectRatio); - -/** - A model for sharing a generic template element to Messenger. This wrapper element allows - specifying whether or not the bubble is sharable and what aspect to render the images. - See https://developers.facebook.com/docs/messenger-platform/send-messages/template/generic - for more details. - */ -DEPRECATED_FOR_MESSENGER -NS_SWIFT_NAME(ShareMessengerGenericTemplateContent) -@interface FBSDKShareMessengerGenericTemplateContent : NSObject <FBSDKSharingContent> - -/** - This specifies whether or not this generic template message can be shared again after the - initial share. Defaults to false. - */ -@property (nonatomic, assign) BOOL isSharable; - -/** - The aspect ratio for when the image is rendered in the generic template bubble after being - shared. Defaults to horizontal. - */ -@property (nonatomic, assign) FBSDKShareMessengerGenericTemplateImageAspectRatio imageAspectRatio; - -/** - A generic template element with a title, optional subtitle, optional image, etc. Required. - */ -@property (nonatomic, copy) FBSDKShareMessengerGenericTemplateElement *element; - -@end - -NS_ASSUME_NONNULL_END diff --git a/frameworks/FBSDKShareKit.framework/Headers/FBSDKShareMessengerGenericTemplateElement.h b/frameworks/FBSDKShareKit.framework/Headers/FBSDKShareMessengerGenericTemplateElement.h deleted file mode 100644 index 0f76587..0000000 --- a/frameworks/FBSDKShareKit.framework/Headers/FBSDKShareMessengerGenericTemplateElement.h +++ /dev/null @@ -1,62 +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 <Foundation/Foundation.h> - -#import <FBSDKCoreKit/FBSDKCopying.h> -#import <FBSDKShareKit/FBSDKShareMessengerActionButton.h> - -NS_ASSUME_NONNULL_BEGIN - -/** - A model for sharing a generic template element to Messenger. This allows specifying title, subtitle, - image, default action, and any other buttons. Title is required. See - https://developers.facebook.com/docs/messenger-platform/send-messages/template/generic for more details. - */ -NS_SWIFT_NAME(ShareMessengerGenericTemplateElement) -DEPRECATED_FOR_MESSENGER -@interface FBSDKShareMessengerGenericTemplateElement : NSObject <FBSDKCopying, NSSecureCoding> - -/** - The rendered title for the shared generic template element. Required. - */ -@property (nonatomic, copy) NSString *title; - -/** - The rendered subtitle for the shared generic template element. Optional. - */ -@property (nonatomic, copy, nullable) NSString *subtitle; - -/** - The image url that will be downloaded and rendered at the top of the generic template. Optional. - */ -@property (nonatomic, copy, nullable) NSURL *imageURL; - -/** - The default action executed when this shared generic tempate is tapped. Title for this button is ignored. Optional. - */ -@property (nonatomic, copy, nullable) id<FBSDKShareMessengerActionButton> defaultAction; - -/** - This specifies what action button to show below the generic template. Optional. - */ -@property (nonatomic, copy, nullable) id<FBSDKShareMessengerActionButton> button; - -@end - -NS_ASSUME_NONNULL_END diff --git a/frameworks/FBSDKShareKit.framework/Headers/FBSDKShareMessengerMediaTemplateContent.h b/frameworks/FBSDKShareKit.framework/Headers/FBSDKShareMessengerMediaTemplateContent.h deleted file mode 100644 index 8b272c4..0000000 --- a/frameworks/FBSDKShareKit.framework/Headers/FBSDKShareMessengerMediaTemplateContent.h +++ /dev/null @@ -1,79 +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 <Foundation/Foundation.h> - -#import <FBSDKShareKit/FBSDKShareMessengerActionButton.h> -#import <FBSDKShareKit/FBSDKSharingContent.h> - -NS_ASSUME_NONNULL_BEGIN - -DEPRECATED_FOR_MESSENGER -typedef NS_ENUM(NSUInteger, FBSDKShareMessengerMediaTemplateMediaType) { - FBSDKShareMessengerMediaTemplateMediaTypeImage = 0, - FBSDKShareMessengerMediaTemplateMediaTypeVideo -} NS_SWIFT_NAME(ShareMessengerMediaTemplateMediaType); - -/** - A model for sharing media template content. See - https://developers.facebook.com/docs/messenger-platform/send-messages/template/media for details. - */ -NS_SWIFT_NAME(ShareMessengerMediaTemplateContent) -DEPRECATED_FOR_MESSENGER -@interface FBSDKShareMessengerMediaTemplateContent : NSObject <FBSDKSharingContent> - -- (instancetype)init NS_UNAVAILABLE; -+ (instancetype)new NS_UNAVAILABLE; - -/** - The media type (image or video) for this content. This must match the media type specified in the - attachmentID/mediaURL to avoid an error when sharing. Defaults to image. - */ -@property (nonatomic, assign) FBSDKShareMessengerMediaTemplateMediaType mediaType; - -/** - The attachmentID of the item to share. Optional, but either attachmentID or mediaURL must be specified. - */ -@property (nonatomic, copy, readonly, nullable) NSString *attachmentID; - -/** - The Facebook url for this piece of media. External urls will not work; this must be a Facebook url. - See https://developers.facebook.com/docs/messenger-platform/send-messages/template/media for details. - Optional, but either attachmentID or mediaURL must be specified. - */ -@property (nonatomic, copy, readonly, nullable) NSURL *mediaURL; - -/** - This specifies what action button to show below the media. Optional. - */ -@property (nonatomic, copy, nullable) id<FBSDKShareMessengerActionButton> button; - -/** - Custom initializer to create media template share with attachment id. - */ -- (instancetype)initWithAttachmentID:(NSString *)attachmentID; - -/** - Custom initializer to create media template share with media url. This must be a Facebook url - and cannot be an external url. - */ -- (instancetype)initWithMediaURL:(NSURL *)mediaURL; - -@end - -NS_ASSUME_NONNULL_END diff --git a/frameworks/FBSDKShareKit.framework/Headers/FBSDKShareMessengerOpenGraphMusicTemplateContent.h b/frameworks/FBSDKShareKit.framework/Headers/FBSDKShareMessengerOpenGraphMusicTemplateContent.h deleted file mode 100644 index 3d1ba31..0000000 --- a/frameworks/FBSDKShareKit.framework/Headers/FBSDKShareMessengerOpenGraphMusicTemplateContent.h +++ /dev/null @@ -1,47 +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 <Foundation/Foundation.h> - -#import <FBSDKShareKit/FBSDKShareMessengerActionButton.h> -#import <FBSDKShareKit/FBSDKSharingContent.h> - -NS_ASSUME_NONNULL_BEGIN - -/** - This share content allows sharing a bubble that plays songs with Open Graph music. - See https://developers.facebook.com/docs/messenger-platform/send-messages/template/open-graph - for details. Passing <FBSDKSharingContent> property pageID is required for this type of share. - */ -DEPRECATED_FOR_MESSENGER -NS_SWIFT_NAME(ShareMessengerOpenGraphMusicTemplateContent) -@interface FBSDKShareMessengerOpenGraphMusicTemplateContent : NSObject <FBSDKSharingContent> - -/** - This must be an Open Graph music url. Required. - */ -@property (nonatomic, copy) NSURL *url; - -/** - This specifies what action button to show below the open graph music bubble. Optional. - */ -@property (nonatomic, copy, nullable) id<FBSDKShareMessengerActionButton> button; - -@end - -NS_ASSUME_NONNULL_END diff --git a/frameworks/FBSDKShareKit.framework/Headers/FBSDKShareMessengerURLActionButton.h b/frameworks/FBSDKShareKit.framework/Headers/FBSDKShareMessengerURLActionButton.h deleted file mode 100644 index 78543d9..0000000 --- a/frameworks/FBSDKShareKit.framework/Headers/FBSDKShareMessengerURLActionButton.h +++ /dev/null @@ -1,68 +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 <Foundation/Foundation.h> - -#import <FBSDKShareKit/FBSDKShareMessengerActionButton.h> - -NS_ASSUME_NONNULL_BEGIN - -typedef NS_ENUM(NSUInteger, FBSDKShareMessengerURLActionButtonWebviewHeightRatio) { - FBSDKShareMessengerURLActionButtonWebviewHeightRatioFull = 0, - FBSDKShareMessengerURLActionButtonWebviewHeightRatioTall, - FBSDKShareMessengerURLActionButtonWebviewHeightRatioCompact -} NS_SWIFT_NAME(ShareMessengerURLActionButton.WebviewHeightRatio); - -/** - A model for a Messenger share URL action button. - */ -DEPRECATED_FOR_MESSENGER -NS_SWIFT_NAME(ShareMessengerURLActionButton) -@interface FBSDKShareMessengerURLActionButton : NSObject <FBSDKShareMessengerActionButton> - -/** - The url that this button should open when tapped. Required. - */ -@property (nonatomic, copy) NSURL *url; - -/** - This controls the display height of the webview when shown in the Messenger app. Defaults to Full. - */ -@property (nonatomic, assign) FBSDKShareMessengerURLActionButtonWebviewHeightRatio webviewHeightRatio; - -/** - This must be true if the url is a Messenger Extensions url. Defaults to NO. - */ -@property (nonatomic, assign) BOOL isMessengerExtensionURL; - -/** - This is a fallback url for a Messenger Extensions enabled button. It is used on clients that do not support - Messenger Extensions. If this is not defined, the url will be used as a fallback. Optional, but ignored - unless isMessengerExtensionURL == YES. - */ -@property (nonatomic, copy, nullable) NSURL *fallbackURL; - -/** - This controls whether we want to hide the share button in the webview or not. It is useful to hide the share - button when the webview is user-specific and contains sensitive information. Defaults to NO. - */ -@property (nonatomic, assign) BOOL shouldHideWebviewShareButton; - -@end - -NS_ASSUME_NONNULL_END diff --git a/frameworks/FBSDKShareKit.framework/Headers/FBSDKShareOpenGraphAction.h b/frameworks/FBSDKShareKit.framework/Headers/FBSDKShareOpenGraphAction.h deleted file mode 100644 index c6facf0..0000000 --- a/frameworks/FBSDKShareKit.framework/Headers/FBSDKShareOpenGraphAction.h +++ /dev/null @@ -1,85 +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 <Foundation/Foundation.h> - -#import <FBSDKCoreKit/FBSDKCopying.h> - -#import <FBSDKShareKit/FBSDKShareOpenGraphObject.h> -#import <FBSDKShareKit/FBSDKShareOpenGraphValueContainer.h> - -NS_ASSUME_NONNULL_BEGIN - -/** - An Open Graph Action for sharing. - - The property keys MUST have namespaces specified on them, such as `og:image`. - */ -NS_SWIFT_NAME(ShareOpenGraphAction) -@interface FBSDKShareOpenGraphAction : FBSDKShareOpenGraphValueContainer <FBSDKCopying, NSSecureCoding> - -- (instancetype)init NS_UNAVAILABLE; -+ (instancetype)new NS_UNAVAILABLE; - -/** - Designated initializer to build a new action and set the object for the specified key. - @param actionType The action type of the receiver - */ -- (instancetype)initWithActionType:(NSString *)actionType -NS_SWIFT_NAME(init(type:)); - -/** - Convenience method to build a new action and set the object for the specified key. - @param actionType The action type of the receiver - @param object The Open Graph object represented by this action - @param key The key for the object - */ -+ (instancetype)actionWithType:(NSString *)actionType object:(FBSDKShareOpenGraphObject *)object key:(NSString *)key; - -/** - Convenience method to build a new action and set the object for the specified key. - @param actionType The action type of the receiver - @param objectID The ID of an existing Open Graph object - @param key The key for the object - */ -+ (instancetype)actionWithType:(NSString *)actionType objectID:(NSString *)objectID key:(NSString *)key; - -/** - Convenience method to build a new action and set the object for the specified key. - @param actionType The action type of the receiver - @param objectURL The URL to a page that defines the Open Graph object with meta tags - @param key The key for the object - */ -+ (instancetype)actionWithType:(NSString *)actionType objectURL:(NSURL *)objectURL key:(NSString *)key; - -/** - Gets the action type. - @return The action type - */ -@property (nonatomic, copy) NSString *actionType; - -/** - Compares the receiver to another Open Graph Action. - @param action The other action - @return YES if the receiver's values are equal to the other action's values; otherwise NO - */ -- (BOOL)isEqualToShareOpenGraphAction:(FBSDKShareOpenGraphAction *)action; - -@end - -NS_ASSUME_NONNULL_END diff --git a/frameworks/FBSDKShareKit.framework/Headers/FBSDKShareOpenGraphContent.h b/frameworks/FBSDKShareKit.framework/Headers/FBSDKShareOpenGraphContent.h deleted file mode 100644 index bf5215d..0000000 --- a/frameworks/FBSDKShareKit.framework/Headers/FBSDKShareOpenGraphContent.h +++ /dev/null @@ -1,55 +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 <Foundation/Foundation.h> - -#import <FBSDKShareKit/FBSDKShareOpenGraphAction.h> -#import <FBSDKShareKit/FBSDKSharingContent.h> - -NS_ASSUME_NONNULL_BEGIN - -/** - A model for Open Graph content to be shared. - */ -NS_SWIFT_NAME(ShareOpenGraphContent) -DEPRECATED_MSG_ATTRIBUTE("Open Graph no longer available; use FBSDKShareLinkContent instead.") -@interface FBSDKShareOpenGraphContent : NSObject <FBSDKSharingContent> - -/** - Open Graph Action to be shared. - @return The action - */ -@property (nonatomic, copy) FBSDKShareOpenGraphAction *action; - -/** - Property name that points to the primary Open Graph Object in the action. - - The value that this action points to will be use for rendering the preview for the share. - */ -@property (nonatomic, copy) NSString *previewPropertyName; - -/** - Compares the receiver to another Open Graph content. - @param content The other content - @return YES if the receiver's values are equal to the other content's values; otherwise NO - */ -- (BOOL)isEqualToShareOpenGraphContent:(FBSDKShareOpenGraphContent *)content; - -@end - -NS_ASSUME_NONNULL_END diff --git a/frameworks/FBSDKShareKit.framework/Headers/FBSDKShareOpenGraphObject.h b/frameworks/FBSDKShareKit.framework/Headers/FBSDKShareOpenGraphObject.h deleted file mode 100644 index 47f0ef3..0000000 --- a/frameworks/FBSDKShareKit.framework/Headers/FBSDKShareOpenGraphObject.h +++ /dev/null @@ -1,64 +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 <Foundation/Foundation.h> - -#import <FBSDKCoreKit/FBSDKCopying.h> - -#import <FBSDKShareKit/FBSDKShareOpenGraphValueContainer.h> - -NS_ASSUME_NONNULL_BEGIN - -/** - An Open Graph Object for sharing. - - The property keys MUST have namespaces specified on them, such as `og:image`, - and `og:type` is required. - - See https://developers.facebook.com/docs/sharing/opengraph/object-properties for other properties. - - You can specify nested namespaces inline to define complex properties. For example, the following - code will generate a fitness.course object with a location: - - FBSDKShareOpenGraphObject *course = [FBSDKShareOpenGraphObject objectWithProperties: - @{ - @"og:type": @"fitness.course", - @"og:title": @"Sample course", - @"fitness:metrics:location:latitude": @"41.40338", - @"fitness:metrics:location:longitude": @"2.17403", - }]; - */ -NS_SWIFT_NAME(ShareOpenGraphObject) -@interface FBSDKShareOpenGraphObject : FBSDKShareOpenGraphValueContainer <FBSDKCopying, NSSecureCoding> - -/** - Convenience method to build a new action and set the object for the specified key. - @param properties Properties for the Open Graph object, which will be parsed into the proper models - */ -+ (instancetype)objectWithProperties:(NSDictionary<NSString *, id> *)properties; - -/** - Compares the receiver to another Open Graph Object. - @param object The other object - @return YES if the receiver's values are equal to the other object's values; otherwise NO - */ -- (BOOL)isEqualToShareOpenGraphObject:(FBSDKShareOpenGraphObject *)object; - -@end - -NS_ASSUME_NONNULL_END diff --git a/frameworks/FBSDKShareKit.framework/Headers/FBSDKShareOpenGraphValueContainer.h b/frameworks/FBSDKShareKit.framework/Headers/FBSDKShareOpenGraphValueContainer.h deleted file mode 100644 index 3ed2f51..0000000 --- a/frameworks/FBSDKShareKit.framework/Headers/FBSDKShareOpenGraphValueContainer.h +++ /dev/null @@ -1,189 +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 <Foundation/Foundation.h> - -NS_ASSUME_NONNULL_BEGIN - -@class FBSDKShareOpenGraphObject; -@class FBSDKSharePhoto; - -/** - Enumeration Block - */ -typedef void (^FBSDKEnumerationBlock)(NSString *key, id object, BOOL *stop) -NS_SWIFT_NAME(EnumerationBlock) -NS_SWIFT_UNAVAILABLE(""); - -/** - Protocol defining operations on open graph actions and objects. - - The property keys MUST have namespaces specified on them, such as `og:image`. - */ -NS_SWIFT_NAME(ShareOpenGraphValueContaining) -@protocol FBSDKShareOpenGraphValueContaining <NSObject, NSSecureCoding> - -/** - Returns a dictionary of all the objects that lets you access each key/object in the receiver. - */ -@property (nonatomic, readonly, strong) NSDictionary<NSString *, id> *allProperties; - -/** - Returns an enumerator object that lets you access each key in the receiver. - @return An enumerator object that lets you access each key in the receiver - */ -@property (nonatomic, readonly, strong) NSEnumerator *keyEnumerator -NS_SWIFT_UNAVAILABLE(""); - -/** - Returns an enumerator object that lets you access each value in the receiver. - @return An enumerator object that lets you access each value in the receiver - */ -@property (nonatomic, readonly, strong) NSEnumerator *objectEnumerator -NS_SWIFT_UNAVAILABLE(""); - -/** - Gets an NSArray out of the receiver. - @param key The key for the value - @return The NSArray value or nil - */ -- (nullable NSArray<id> *)arrayForKey:(NSString *)key; - -/** - Applies a given block object to the entries of the receiver. - @param block A block object to operate on entries in the receiver - */ -- (void)enumerateKeysAndObjectsUsingBlock:(FBSDKEnumerationBlock)block -NS_SWIFT_UNAVAILABLE(""); - -/** - Gets an NSNumber out of the receiver. - @param key The key for the value - @return The NSNumber value or nil - */ -- (nullable NSNumber *)numberForKey:(NSString *)key; - -/** - Gets an NSString out of the receiver. - @param key The key for the value - @return The NSString value or nil - */ -- (nullable NSString *)stringForKey:(NSString *)key; - -/** - Gets an NSURL out of the receiver. - @param key The key for the value - @return The NSURL value or nil - */ -- (nullable NSURL *)URLForKey:(NSString *)key; - -/** - Gets an FBSDKShareOpenGraphObject out of the receiver. - @param key The key for the value - @return The FBSDKShareOpenGraphObject value or nil - */ -- (nullable FBSDKShareOpenGraphObject *)objectForKey:(NSString *)key; - -/** - Enables subscript access to the values in the receiver. - @param key The key for the value - @return The value - */ -- (nullable id)objectForKeyedSubscript:(NSString *)key; - -/** - Parses properties out of a dictionary into the receiver. - @param properties The properties to parse. - */ -- (void)parseProperties:(NSDictionary<NSString *, id> *)properties; - -/** - Gets an FBSDKSharePhoto out of the receiver. - @param key The key for the value - @return The FBSDKSharePhoto value or nil - */ -- (nullable FBSDKSharePhoto *)photoForKey:(NSString *)key; - -/** - Removes a value from the receiver for the specified key. - @param key The key for the value - */ -- (void)removeObjectForKey:(NSString *)key; - -/** - Sets an NSArray on the receiver. - - This method will throw if the array contains any values that is not an NSNumber, NSString, NSURL, - FBSDKSharePhoto or FBSDKShareOpenGraphObject. - @param array The NSArray value - @param key The key for the value - */ -- (void)setArray:(nullable NSArray<id> *)array forKey:(NSString *)key -NS_SWIFT_NAME(set(_:forKey:)); - -/** - Sets an NSNumber on the receiver. - @param number The NSNumber value - @param key The key for the value - */ -- (void)setNumber:(nullable NSNumber *)number forKey:(NSString *)key -NS_SWIFT_NAME(set(_:forKey:)); - -/** - Sets an FBSDKShareOpenGraphObject on the receiver. - @param object The FBSDKShareOpenGraphObject value - @param key The key for the value - */ -- (void)setObject:(nullable FBSDKShareOpenGraphObject *)object forKey:(NSString *)key -NS_SWIFT_NAME(set(_:forKey:)); - -/** - Sets an FBSDKSharePhoto on the receiver. - @param photo The FBSDKSharePhoto value - @param key The key for the value - */ -- (void)setPhoto:(nullable FBSDKSharePhoto *)photo forKey:(NSString *)key -NS_SWIFT_NAME(set(_:forKey:)); - -/** - Sets an NSString on the receiver. - @param string The NSString value - @param key The key for the value - */ -- (void)setString:(nullable NSString *)string forKey:(NSString *)key -NS_SWIFT_NAME(set(_:forKey:)); - -/** - Sets an NSURL on the receiver. - @param URL The NSURL value - @param key The key for the value - */ -- (void)setURL:(nullable NSURL *)URL forKey:(NSString *)key -NS_SWIFT_NAME(set(_:forKey:)); - -@end - -/** - A base class to container Open Graph values. - */ -NS_SWIFT_NAME(ShareOpenGraphValueContainer) -@interface FBSDKShareOpenGraphValueContainer : NSObject <FBSDKShareOpenGraphValueContaining> - -@end - -NS_ASSUME_NONNULL_END diff --git a/frameworks/FBSDKShareKit.framework/Headers/FBSDKSharePhoto.h b/frameworks/FBSDKShareKit.framework/Headers/FBSDKSharePhoto.h index 0cd272c..7fdcf7c 100644 --- a/frameworks/FBSDKShareKit.framework/Headers/FBSDKSharePhoto.h +++ b/frameworks/FBSDKShareKit.framework/Headers/FBSDKSharePhoto.h @@ -18,9 +18,9 @@ #import <UIKit/UIKit.h> -#import <FBSDKCoreKit/FBSDKCopying.h> -#import <FBSDKShareKit/FBSDKShareMediaContent.h> -#import <FBSDKShareKit/FBSDKSharingValidation.h> +#import "FBSDKCoreKitImport.h" +#import "FBSDKShareMediaContent.h" +#import "FBSDKSharingValidation.h" NS_ASSUME_NONNULL_BEGIN diff --git a/frameworks/FBSDKShareKit.framework/Headers/FBSDKSharePhotoContent.h b/frameworks/FBSDKShareKit.framework/Headers/FBSDKSharePhotoContent.h index fbb3e60..6d20c3e 100644 --- a/frameworks/FBSDKShareKit.framework/Headers/FBSDKSharePhotoContent.h +++ b/frameworks/FBSDKShareKit.framework/Headers/FBSDKSharePhotoContent.h @@ -18,7 +18,7 @@ #import <Foundation/Foundation.h> -#import <FBSDKShareKit/FBSDKSharingContent.h> +#import "FBSDKSharingContent.h" NS_ASSUME_NONNULL_BEGIN diff --git a/frameworks/FBSDKShareKit.framework/Headers/FBSDKShareVideo.h b/frameworks/FBSDKShareKit.framework/Headers/FBSDKShareVideo.h index 4ceb32a..2e135ff 100644 --- a/frameworks/FBSDKShareKit.framework/Headers/FBSDKShareVideo.h +++ b/frameworks/FBSDKShareKit.framework/Headers/FBSDKShareVideo.h @@ -19,10 +19,9 @@ #import <Photos/Photos.h> #import <UIKit/UIKit.h> -#import <FBSDKCoreKit/FBSDKCopying.h> -#import <FBSDKShareKit/FBSDKShareMediaContent.h> -#import <FBSDKShareKit/FBSDKSharingValidation.h> - +#import "FBSDKCoreKitImport.h" +#import "FBSDKShareMediaContent.h" +#import "FBSDKSharingValidation.h" NS_ASSUME_NONNULL_BEGIN @class FBSDKSharePhoto; diff --git a/frameworks/FBSDKShareKit.framework/Headers/FBSDKShareVideoContent.h b/frameworks/FBSDKShareKit.framework/Headers/FBSDKShareVideoContent.h index 80c222e..552eb2b 100644 --- a/frameworks/FBSDKShareKit.framework/Headers/FBSDKShareVideoContent.h +++ b/frameworks/FBSDKShareKit.framework/Headers/FBSDKShareVideoContent.h @@ -18,9 +18,9 @@ #import <Foundation/Foundation.h> -#import <FBSDKShareKit/FBSDKSharePhoto.h> -#import <FBSDKShareKit/FBSDKShareVideo.h> -#import <FBSDKShareKit/FBSDKSharingContent.h> +#import "FBSDKSharePhoto.h" +#import "FBSDKShareVideo.h" +#import "FBSDKSharingContent.h" NS_ASSUME_NONNULL_BEGIN diff --git a/frameworks/FBSDKShareKit.framework/Headers/FBSDKSharing.h b/frameworks/FBSDKShareKit.framework/Headers/FBSDKSharing.h index c95c674..6775d5d 100644 --- a/frameworks/FBSDKShareKit.framework/Headers/FBSDKSharing.h +++ b/frameworks/FBSDKShareKit.framework/Headers/FBSDKSharing.h @@ -18,7 +18,7 @@ #import <Foundation/Foundation.h> -#import <FBSDKShareKit/FBSDKSharingContent.h> +#import "FBSDKSharingContent.h" NS_ASSUME_NONNULL_BEGIN @@ -30,8 +30,6 @@ @see FBSDKShareDialog @see FBSDKMessageDialog - - @see FBSDKShareAPI */ NS_SWIFT_NAME(Sharing) @protocol FBSDKSharing <NSObject> diff --git a/frameworks/FBSDKShareKit.framework/Headers/FBSDKSharingButton.h b/frameworks/FBSDKShareKit.framework/Headers/FBSDKSharingButton.h index 3f54925..145b285 100644 --- a/frameworks/FBSDKShareKit.framework/Headers/FBSDKSharingButton.h +++ b/frameworks/FBSDKShareKit.framework/Headers/FBSDKSharingButton.h @@ -16,9 +16,13 @@ // 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 "TargetConditionals.h" + +#if !TARGET_OS_TV + #import <Foundation/Foundation.h> -#import <FBSDKShareKit/FBSDKSharingContent.h> +#import "FBSDKSharingContent.h" NS_ASSUME_NONNULL_BEGIN @@ -40,3 +44,5 @@ @end NS_ASSUME_NONNULL_END + +#endif diff --git a/frameworks/FBSDKShareKit.framework/Headers/FBSDKSharingContent.h b/frameworks/FBSDKShareKit.framework/Headers/FBSDKSharingContent.h index ec2ca2e..7833eab 100644 --- a/frameworks/FBSDKShareKit.framework/Headers/FBSDKSharingContent.h +++ b/frameworks/FBSDKShareKit.framework/Headers/FBSDKSharingContent.h @@ -18,8 +18,8 @@ #import <Foundation/Foundation.h> -#import <FBSDKCoreKit/FBSDKCopying.h> -#import <FBSDKShareKit/FBSDKSharingValidation.h> +#import "FBSDKCoreKitImport.h" +#import "FBSDKSharingValidation.h" NS_ASSUME_NONNULL_BEGIN diff --git a/frameworks/FBSDKShareKit.framework/Headers/FBSDKSharingScheme.h b/frameworks/FBSDKShareKit.framework/Headers/FBSDKSharingScheme.h index 031158e..859db49 100644 --- a/frameworks/FBSDKShareKit.framework/Headers/FBSDKSharingScheme.h +++ b/frameworks/FBSDKShareKit.framework/Headers/FBSDKSharingScheme.h @@ -16,6 +16,10 @@ // 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 "TargetConditionals.h" + +#if !TARGET_OS_TV + #import "FBSDKShareDialogMode.h" NS_ASSUME_NONNULL_BEGIN @@ -36,3 +40,5 @@ @end NS_ASSUME_NONNULL_END + +#endif diff --git a/frameworks/FBSDKShareKit.framework/Info.plist b/frameworks/FBSDKShareKit.framework/Info.plist index 1e174a5..e5cf06a 100644 --- a/frameworks/FBSDKShareKit.framework/Info.plist +++ b/frameworks/FBSDKShareKit.framework/Info.plist Binary files differ diff --git a/frameworks/WAFbImpl.framework/Headers/WAFbImpl.h b/frameworks/WAFbImpl.framework/Headers/WAFbImpl.h index 0b912de..77448c7 100644 --- a/frameworks/WAFbImpl.framework/Headers/WAFbImpl.h +++ b/frameworks/WAFbImpl.framework/Headers/WAFbImpl.h @@ -16,4 +16,4 @@ // In this header, you should import all the public headers of your framework using statements like #import <WAFbImpl/PublicHeader.h> -//time:2020/05/20 09:27 ver:3.8.4 +//time:2021/01/28 09:27 ver:3.9.2 diff --git a/frameworks/WAFbImpl.framework/Info.plist b/frameworks/WAFbImpl.framework/Info.plist index 50e534d..2fd93de 100644 --- a/frameworks/WAFbImpl.framework/Info.plist +++ b/frameworks/WAFbImpl.framework/Info.plist Binary files differ diff --git a/frameworks/WAFbImpl.framework/WAFbImpl b/frameworks/WAFbImpl.framework/WAFbImpl index b3710e2..b5429e2 100644 --- a/frameworks/WAFbImpl.framework/WAFbImpl +++ b/frameworks/WAFbImpl.framework/WAFbImpl Binary files differ -- Gitblit v1.8.0