Update Facebook SDK to 5.2.1 & 1.17.3 version bump

.circleci/config.yml

@@ -4,7 +4,7 @@ defaults: &defaults
     shell: /bin/bash --login -eo pipefail
 aliases:
   - &prepare
-    | 
+    |
       git submodule update --init --recursive
       gem install bundler
       bundle install
@@ -66,7 +66,7 @@ jobs:
       - checkout
       - run: *prepare
       - run: |
-            xcrun simctl create "Apple TV 1080p" com.apple.CoreSimulator.SimDeviceType.Apple-TV-1080p com.apple.CoreSimulator.SimRuntime.tvOS-11-0
+            xcrun simctl create "Apple TV 1080p" com.apple.CoreSimulator.SimDeviceType.Apple-TV-1080p com.apple.CoreSimulator.SimRuntime.tvOS-12-2
             bundle exec rake package:release
   jazzy:
     <<: *defaults

.gitignore

@@ -29,6 +29,7 @@ xcuserdata
 ## Dependency Managers
 Pods/
 Carthage/Build
+Carthage/Checkouts
 docs/
 ./Bolts
 

.travis.yml

@@ -18,7 +18,7 @@ jobs:
       install: bundle install
       script:
       - ./Scripts/jazzy.sh
-      - xcrun simctl create "Apple TV 1080p" com.apple.CoreSimulator.SimDeviceType.Apple-TV-1080p com.apple.CoreSimulator.SimRuntime.tvOS-11-0
+      - xcrun simctl create "Apple TV 1080p" com.apple.CoreSimulator.SimDeviceType.Apple-TV-1080p com.apple.CoreSimulator.SimRuntime.tvOS-12-2
       - bundle exec rake package:release
       deploy:
         - provider: releases

CHANGELOG.md

@@ -1,10 +1,14 @@
-# Parse-SDK-iOS-OSX Chnagelog
+# Parse-SDK-iOS-OSX Changelog
 
 ### master
+[Full Changelog](https://github.com/parse-community/Parse-SDK-iOS-OSX/compare/1.17.3...master)
+* _Contributing to this repo? Add info about your change here to be included in next release_
 
-* Fixes NSInternalInconsistencyException handling starting Bolts 1.9.0 by emitting soft NSErrors
-* Fixes issue affecting public getter/setters in PFACL's in Swift (#1083)
-* Prevent deadlocks when saving objects with cicrular references (#916)
-* Prevent deadlocks when running fetchAll with circluar references (#1184)
-* Adds NSNotification when an invalid session token is encountered
+### 1.17.3
+[Full Changelog](https://github.com/parse-community/Parse-SDK-iOS-OSX/compare/1.17.2...1.17.3)
 
+- FIX: Updates xcbuildtools submodule ([#1365](https://github.com/parse-community/Parse-SDK-iOS-OSX/pull/1365)), thanks to [Darren Black](https://github.com/drdaz)
+- FIX: Bandaid for Crashlytics [#944](https://github.com/parse-community/Parse-SDK-iOS-OSX/issues/944) ([#1376](https://github.com/parse-community/Parse-SDK-iOS-OSX/pull/1376)), thanks to [Rogers George](https://github.com/ceramicatheist)
+- NEW: tvOS push support ([#1375](https://github.com/parse-community/Parse-SDK-iOS-OSX/pull/1375)), thanks to [Thomas Kollbach](https://github.com/toto)
+- FIX: Class properties ([#1400](https://github.com/parse-community/Parse-SDK-iOS-OSX/pull/1400)), thanks to [Thomas Kollbach](https://github.com/toto)
+- FIX: Upgrade ParseFacebookUtils dependency to Facebook SDK v5.2.1 ([#1411](https://github.com/parse-community/Parse-SDK-iOS-OSX/issues/1411)), thanks to [Herrick Wolber](https://github.com/rico237)

Cartfile

@@ -1,3 +1,2 @@
 github "BoltsFramework/Bolts-ObjC" ~> 1.9
-github "facebook/facebook-objc-sdk" ~> 4.29
-
+github "facebook/facebook-objc-sdk" ~> 5.2.1

Cartfile.resolved

@@ -1,3 +1,3 @@
 github "BoltsFramework/Bolts-ObjC" "1.9.0"
 github "erikdoe/OCMock" "v3.4.3"
-github "facebook/facebook-objc-sdk" "v4.44.1"
+github "facebook/facebook-objc-sdk" "v5.2.1"

Parse.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'Parse'
-  s.version          = '1.17.2'
+  s.version          = '1.17.3'
   s.license          =  { :type => 'BSD', :file => 'LICENSE' }
   s.homepage         = 'http://parseplatform.org/'
   s.summary          = 'A library that gives you access to the powerful Parse cloud platform from your iOS/OS X/watchOS/tvOS app.'
@@ -16,15 +16,15 @@ Pod::Spec.new do |s|
   s.watchos.deployment_target = '2.0'
 
   s.default_subspec = 'Core'
-  
+
   s.subspec 'Core' do |s|
     s.requires_arc = true
 
     s.source_files = 'Parse/Parse/*.{h,m}',
                      'Parse/Parse/Internal/**/*.{h,m}'
     s.public_header_files = 'Parse/Parse/*.h'
     s.private_header_files = 'Parse/Parse/Internal/**/*.h'
-  
+
     s.ios.exclude_files = 'Parse/Parse/Internal/PFMemoryEventuallyQueue.{h,m}'
     s.osx.exclude_files = 'Parse/Parse/PFNetworkActivityIndicatorManager.{h,m}',
                           'Parse/Parse/PFProduct.{h,m}',
@@ -53,9 +53,9 @@ Pod::Spec.new do |s|
                               'Parse/Parse/Internal/Installation/PFInstallationPrivate.h',
                               'Parse/Parse/Internal/Commands/PFRESTPushCommand.{h,m}',
                               'Parse/Parse/Internal/PFMemoryEventuallyQueue.{h,m}'
-  
+
     s.resource_bundle = { 'Parse' => 'Parse/Parse/Resources/en.lproj' }
-  
+
     s.ios.frameworks = 'AudioToolbox',
                        'CFNetwork',
                        'CoreGraphics',
@@ -77,9 +77,9 @@ Pod::Spec.new do |s|
                         'StoreKit',
                         'SystemConfiguration',
                         'Security'
-  
+
     s.libraries        = 'z', 'sqlite3'
-  
+
     s.dependency 'Bolts/Tasks', '~> 1.9'
   end
 
@@ -104,7 +104,7 @@ Pod::Spec.new do |s|
 
     s.dependency 'Parse/Core'
     s.dependency 'Bolts', '~> 1.9'
-    s.dependency 'FBSDKLoginKit', '~> 4.33'
+    s.dependency 'FBSDKLoginKit', '~> 5.2.1'
   end
 
   s.subspec 'FacebookUtils-tvOS' do |s|
@@ -126,8 +126,8 @@ Pod::Spec.new do |s|
 
     s.dependency 'Parse/Core'
     s.dependency 'Bolts', '~> 1.9'
-    s.dependency 'FBSDKTVOSKit', '~> 4.33'
-    s.dependency 'FBSDKShareKit', '~> 4.33'
+    s.dependency 'FBSDKTVOSKit', '~> 5.2.1'
+    s.dependency 'FBSDKShareKit', '~> 5.2.1'
   end
 
   s.subspec 'TwitterUtils' do |s|

Parse/Parse/PFConstants.h

@@ -13,7 +13,7 @@
 #pragma mark - SDK Version
 ///--------------------------------------
 
-#define PARSE_VERSION @"1.17.2"
+#define PARSE_VERSION @"1.17.3"
 
 ///--------------------------------------
 #pragma mark - Platform

Parse/Parse/Resources/Parse-OSX.Info.plist

@@ -13,10 +13,10 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.17.2</string>
+	<string>1.17.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.17.2</string>
+	<string>1.17.3</string>
 </dict>
 </plist>

Parse/Parse/Resources/Parse-iOS.Info.plist

@@ -13,7 +13,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.17.2</string>
+	<string>1.17.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleSupportedPlatforms</key>
@@ -22,7 +22,7 @@
 		<string>iPhoneOS</string>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.17.2</string>
+	<string>1.17.3</string>
 	<key>MinimumOSVersion</key>
 	<string>6.0</string>
 </dict>

Parse/Parse/Resources/Parse-tvOS.Info.plist

@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.17.2</string>
+	<string>1.17.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.17.2</string>
+	<string>1.17.3</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
 </dict>

Parse/Parse/Resources/Parse-watchOS.Info.plist

@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.17.2</string>
+	<string>1.17.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.17.2</string>
+	<string>1.17.3</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
 </dict>

ParseFacebookUtils/ParseFacebookUtils.xcodeproj/project.pbxproj

@@ -1065,7 +1065,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "if [ ! -d $SRCROOT/Vendor/tvOS ]; then\nmkdir $SRCROOT/Vendor/tvOS\nfi\n\ncd $SRCROOT/Vendor/tvOS\n\nif [[ ! -d \"FBSDKCoreKit.framework\" || ! -d \"FBSDKTVOSKit.framework\" ]]; then\nARCHIVE_NAME=FBSDK.zip\n\nARCHIVE_URL=\"https://origincache.facebook.com/developers/resources/?id=FacebookSDKs-tvOS-current.zip\"\ncurl $ARCHIVE_URL -o $ARCHIVE_NAME\n\nunzip $ARCHIVE_NAME -d fbsdk\nmv fbsdk/FBSDKCoreKit.framework .\nmv fbsdk/FBSDKTVOSKit.framework .\n\nrm $ARCHIVE_NAME\nrm -r fbsdk\nfi\n";
+			shellScript = "if [ ! -d $SRCROOT/Vendor/tvOS ]; then\nmkdir $SRCROOT/Vendor/tvOS\nfi\n\ncd $SRCROOT/Vendor/tvOS\n\nif [[ ! -d \"FBSDKCoreKit.framework\" || ! -d \"FBSDKTVOSKit.framework\" ]]; then\nARCHIVE_NAME=FBSDK.zip\n\nARCHIVE_URL=\"https://github.com/facebook/facebook-objc-sdk/releases/latest/download/FacebookSDK_Static.zip\"\ncurl -Lk $ARCHIVE_URL -o $ARCHIVE_NAME\n\nunzip $ARCHIVE_NAME -d fbsdk\nmv fbsdk/tv/FBSDKCoreKit.framework .\nmv fbsdk/tv/FBSDKTVOSKit.framework .\n\nrm $ARCHIVE_NAME\nrm -r fbsdk\nfi\n";
 		};
 		4A1351B220281814000F5FD5 /* Fetch Latest Dependencies */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -1079,7 +1079,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "if [ ! -d $SRCROOT/Vendor ]; then\nmkdir $SRCROOT/Vendor\nfi\n\ncd $SRCROOT/Vendor\n\nif [[ ! -d \"FBSDKCoreKit.framework\" || ! -d \"FBSDKLoginKit.framework\" ]]; then\nARCHIVE_NAME=FBSDK.zip\n\nARCHIVE_URL=\"https://origincache.facebook.com/developers/resources/?id=facebook-ios-sdk-current.zip\"\ncurl $ARCHIVE_URL -o $ARCHIVE_NAME\n\nunzip $ARCHIVE_NAME -d fbsdk\nmv fbsdk/FBSDKCoreKit.framework .\nmv fbsdk/FBSDKLoginKit.framework .\n\nrm $ARCHIVE_NAME\nrm -r fbsdk\nfi\n";
+			shellScript = "if [ ! -d $SRCROOT/Vendor ]; then\nmkdir $SRCROOT/Vendor\nfi\n\ncd $SRCROOT/Vendor\n\nif [[ ! -d \"FBSDKCoreKit.framework\" || ! -d \"FBSDKLoginKit.framework\" ]]; then\nARCHIVE_NAME=FBSDK.zip\n\nARCHIVE_URL=\"https://github.com/facebook/facebook-objc-sdk/releases/latest/download/FacebookSDK_Static.zip\"\ncurl -Lk $ARCHIVE_URL -o $ARCHIVE_NAME\n\nunzip $ARCHIVE_NAME -d fbsdk\nmv fbsdk/FBSDKCoreKit.framework .\nmv fbsdk/FBSDKLoginKit.framework .\n\nrm $ARCHIVE_NAME\nrm -r fbsdk\nfi\n";
 		};
 		4A13525320282699000F5FD5 /* Cleanup Vendored Static lib */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -1480,4 +1480,4 @@
 /* End XCConfigurationList section */
 	};
 	rootObject = 0867D690FE84028FC02AAC07 /* Project object */;
-}
+}

ParseFacebookUtils/ParseFacebookUtils/Internal/AuthenticationProvider/iOS/PFFacebookMobileAuthenticationProvider.m

@@ -13,10 +13,8 @@
 #import <Bolts/BFTask.h>
 #import <Bolts/BFTaskCompletionSource.h>
 
-#import <FBSDKCoreKit/FBSDKAccessToken.h>
-#import <FBSDKCoreKit/FBSDKSettings.h>
-
-#import <FBSDKLoginKit/FBSDKLoginManagerLoginResult.h>
+#import <FBSDKCoreKit/FBSDKCoreKit.h>
+#import <FBSDKLoginKit/FBSDKLoginKit.h>
 
 #import <Parse/PFConstants.h>
 
@@ -45,16 +43,11 @@ - (instancetype)initWithApplication:(UIApplication *)application
 - (BFTask<NSDictionary<NSString *, NSString *>*> *)authenticateAsyncWithReadPermissions:(nullable NSArray<NSString *> *)readPermissions
                                                                      publishPermissions:(nullable NSArray<NSString *> *)publishPermissions
                                                                      fromViewComtroller:(UIViewController *)viewController {
-    if (readPermissions && publishPermissions) {
-        NSString *description = @"Read permissions are not permitted to be requested with publish permissions.";
-        NSError *error = [NSError errorWithDomain:PFParseErrorDomain
-                                             code:kPFErrorFacebookInvalidSession
-                                         userInfo:@{ NSLocalizedDescriptionKey: description }];
-        return [BFTask taskWithError:error];
-    }
-
+
+    NSArray *permissions = [readPermissions arrayByAddingObjectsFromArray:publishPermissions];
+
     BFTaskCompletionSource *taskCompletionSource = [BFTaskCompletionSource taskCompletionSource];
-    FBSDKLoginManagerRequestTokenHandler resultHandler = ^(FBSDKLoginManagerLoginResult *result, NSError *error) {
+    FBSDKLoginManagerLoginResultBlock resultHandler = ^(FBSDKLoginManagerLoginResult *result, NSError *error) {
         if (result.isCancelled) {
             [taskCompletionSource cancel];
         } else if (error) {
@@ -63,15 +56,9 @@ - (instancetype)initWithApplication:(UIApplication *)application
             taskCompletionSource.result = [PFFacebookPrivateUtilities userAuthenticationDataFromAccessToken:result.token];
         }
     };
-    if (publishPermissions) {
-        [self.loginManager logInWithPublishPermissions:publishPermissions
-                                    fromViewController:viewController
-                                               handler:resultHandler];
-    } else {
-        [self.loginManager logInWithReadPermissions:readPermissions
-                                 fromViewController:viewController
-                                            handler:resultHandler];
-    }
+
+    [self.loginManager logInWithPermissions:permissions fromViewController:viewController handler:resultHandler];
+
     return taskCompletionSource.task;
 }
 

ParseFacebookUtils/ParseFacebookUtils/Internal/AuthenticationProvider/tvOS/PFFacebookDeviceAuthenticationProvider.m

@@ -44,8 +44,8 @@ @implementation PFFacebookDeviceAuthenticationProvider
         self->_loginTaskCompletionSource = [BFTaskCompletionSource taskCompletionSource];
        self-> _loginViewController = [[FBSDKDeviceLoginViewController alloc] init];
         self->_loginViewController.delegate = self;
-        self->_loginViewController.readPermissions = readPermissions;
-        self->_loginViewController.publishPermissions = publishPermissions;
+        NSArray *permissions = [readPermissions arrayByAddingObjectsFromArray:publishPermissions];
+        self->_loginViewController.permissions = permissions;
 
         [viewController presentViewController:self->_loginViewController animated:YES completion:nil];
 

ParseFacebookUtils/ParseFacebookUtils/Internal/PFFacebookPrivateUtilities.h

@@ -13,7 +13,7 @@
 #import <Bolts/BFExecutor.h>
 #import <Bolts/BFTask.h>
 
-#import <FBSDKCoreKit/FBSDKAccessToken.h>
+#import <FBSDKCoreKit/FBSDKCoreKit.h>
 
 #import <Parse/PFConstants.h>
 

ParseFacebookUtils/ParseFacebookUtils/Internal/PFFacebookPrivateUtilities.m

@@ -9,7 +9,7 @@
 
 #import "PFFacebookPrivateUtilities.h"
 
-#import <FBSDKCoreKit/FBSDKSettings.h>
+#import <FBSDKCoreKit/FBSDKCoreKit.h>
 
 @implementation PFFacebookPrivateUtilities
 
@@ -50,14 +50,8 @@ + (nullable FBSDKAccessToken *)facebookAccessTokenFromUserAuthenticationData:(nu
         return nil;
     }
 
-    NSDate *expirationDate = [[NSDateFormatter pffb_preciseDateFormatter] dateFromString:expirationDateString];
-    FBSDKAccessToken *token = [[FBSDKAccessToken alloc] initWithTokenString:accessToken
-                                                                permissions:nil
-                                                        declinedPermissions:nil
-                                                                      appID:[FBSDKSettings appID]
-                                                                     userID:authData[@"id"]
-                                                             expirationDate:expirationDate
-                                                                refreshDate:nil];
+NSDate *expirationDate = [[NSDateFormatter pffb_preciseDateFormatter] dateFromString:expirationDateString];
+    FBSDKAccessToken *token = [[FBSDKAccessToken alloc] initWithTokenString: accessToken permissions:@[] declinedPermissions:@[] expiredPermissions:@[] appID: [FBSDKSettings appID] userID: authData[@"id"] expirationDate: expirationDate refreshDate: nil dataAccessExpirationDate: nil];
     return token;
 }
 

ParseFacebookUtils/ParseFacebookUtils/PFFacebookUtils.h

@@ -14,7 +14,7 @@
 #import <Parse/PFConstants.h>
 #import <Parse/PFUser.h>
 
-#import <FBSDKCoreKit/FBSDKAccessToken.h>
+#import <FBSDKCoreKit/FBSDKCoreKit.h>
 
 #if TARGET_OS_IOS
 #import <FBSDKLoginKit/FBSDKLoginManager.h>

ParseFacebookUtils/Resources/Info-iOS.plist

@@ -13,7 +13,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.17.2</string>
+	<string>1.17.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleSupportedPlatforms</key>
@@ -22,7 +22,7 @@
 		<string>iPhoneOS</string>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.17.2</string>
+	<string>1.17.3</string>
 	<key>MinimumOSVersion</key>
 	<string>6.0</string>
 </dict>

ParseFacebookUtils/Resources/Info-tvOS.plist

@@ -13,10 +13,10 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.17.2</string>
+	<string>1.17.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.17.2</string>
+	<string>1.17.3</string>
 </dict>
 </plist>