From 0bb0cd51e867b0b3f69acdd087e0145eb083298b Mon Sep 17 00:00:00 2001 From: Darren Black Date: Fri, 13 Sep 2019 14:51:14 +0200 Subject: [PATCH] 1.17.3 release tweaks (#1447) * Fixes Pod linting errors, warnings Increases tvOS deploy target to match FB SDK 5 deploy target * Updates Changelog * Fixes Twitter tests * Updates Changelog --- CHANGELOG.md | 2 +- Parse.podspec | 4 ++-- .../tvOS/PFFacebookDeviceAuthenticationProvider.m | 2 +- ParseTwitterUtils/ParseTwitterUtils/PFTwitterUtils.m | 2 +- ParseTwitterUtils/Tests/Unit/TwitterUtilsTests.m | 8 ++++---- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 18c277035..e375d3df2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,4 +11,4 @@ - 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) +- FIX: Upgrade ParseFacebookUtils dependency to Facebook SDK v5.x ([#1411](https://github.com/parse-community/Parse-SDK-iOS-OSX/issues/1411)), ([#1424](https://github.com/parse-community/Parse-SDK-iOS-OSX/pull/1424)) thanks to [Herrick Wolber](https://github.com/rico237), [Darren Black](https://github.com/drdaz) diff --git a/Parse.podspec b/Parse.podspec index c701a6268..8eaf200b1 100644 --- a/Parse.podspec +++ b/Parse.podspec @@ -12,7 +12,7 @@ Pod::Spec.new do |s| s.platform = :ios, :osx, :tvos, :watchos s.ios.deployment_target = '8.0' s.osx.deployment_target = '10.9' - s.tvos.deployment_target = '9.0' + s.tvos.deployment_target = '10.0' s.watchos.deployment_target = '2.0' s.default_subspec = 'Core' @@ -109,7 +109,7 @@ Pod::Spec.new do |s| s.subspec 'FacebookUtils-tvOS' do |s| s.platform = :tvos - s.tvos.deployment_target = '9.0' + s.tvos.deployment_target = '10.0' s.public_header_files = 'ParseFacebookUtils/ParseFacebookUtils/*.h' s.source_files = 'ParseFacebookUtils/ParseFacebookUtils/**/*.{h,m}' s.exclude_files = 'ParseFacebookUtils/ParseFacebookUtils/ParseFacebookUtilsV4.h', diff --git a/ParseFacebookUtils/ParseFacebookUtils/Internal/AuthenticationProvider/tvOS/PFFacebookDeviceAuthenticationProvider.m b/ParseFacebookUtils/ParseFacebookUtils/Internal/AuthenticationProvider/tvOS/PFFacebookDeviceAuthenticationProvider.m index b5239f7cf..c347812c0 100644 --- a/ParseFacebookUtils/ParseFacebookUtils/Internal/AuthenticationProvider/tvOS/PFFacebookDeviceAuthenticationProvider.m +++ b/ParseFacebookUtils/ParseFacebookUtils/Internal/AuthenticationProvider/tvOS/PFFacebookDeviceAuthenticationProvider.m @@ -82,7 +82,7 @@ - (void)deviceLoginViewControllerDidFinish:(FBSDKDeviceLoginViewController *)vie _loginTaskCompletionSource = nil; } -- (void)deviceLoginViewControllerDidFail:(FBSDKDeviceLoginViewController *)viewController error:(NSError *)error { +- (void)deviceLoginViewController:(FBSDKDeviceLoginViewController *)viewController didFailWithError:(NSError *)error { [_loginTaskCompletionSource trySetError:error]; _loginViewController = nil; _loginTaskCompletionSource = nil; diff --git a/ParseTwitterUtils/ParseTwitterUtils/PFTwitterUtils.m b/ParseTwitterUtils/ParseTwitterUtils/PFTwitterUtils.m index 4444916d0..a3cb4a2c2 100644 --- a/ParseTwitterUtils/ParseTwitterUtils/PFTwitterUtils.m +++ b/ParseTwitterUtils/ParseTwitterUtils/PFTwitterUtils.m @@ -44,7 +44,7 @@ + (void)_assertTwitterInitialized { } + (void)_assertParseInitialized { - PFTWConsistencyAssert([Parse getApplicationId], + PFTWConsistencyAssert([Parse applicationId], @"PFTwitterUtils should be initialized after setting up Parse."); } diff --git a/ParseTwitterUtils/Tests/Unit/TwitterUtilsTests.m b/ParseTwitterUtils/Tests/Unit/TwitterUtilsTests.m index cdcba2eb9..37f5998e3 100644 --- a/ParseTwitterUtils/Tests/Unit/TwitterUtilsTests.m +++ b/ParseTwitterUtils/Tests/Unit/TwitterUtilsTests.m @@ -39,8 +39,8 @@ - (void)tearDown { - (void)testInitialize { id parseMock = PFStrictClassMock([Parse class]); - OCMStub([parseMock getApplicationId]).andReturn(@"yolo"); - OCMStub([parseMock getClientKey]).andReturn(@"yarr"); + OCMStub([parseMock applicationId]).andReturn(@"yolo"); + OCMStub([parseMock clientKey]).andReturn(@"yarr"); id userMock = PFStrictClassMock([PFUser class]); OCMExpect(ClassMethod([userMock registerAuthenticationDelegate:[OCMArg checkWithBlock:^BOOL(id obj) { @@ -57,8 +57,8 @@ - (void)testInitialize { - (void)testInitializeTwice { id parseMock = PFStrictClassMock([Parse class]); - OCMStub([parseMock getApplicationId]).andReturn(@"yolo"); - OCMStub([parseMock getClientKey]).andReturn(@"yarr"); + OCMStub([parseMock applicationId]).andReturn(@"yolo"); + OCMStub([parseMock clientKey]).andReturn(@"yarr"); id userMock = PFStrictClassMock([PFUser class]);