Skip to content

Commit

Permalink
1.17.3 release tweaks (#1447)
Browse files Browse the repository at this point in the history
* Fixes Pod linting errors, warnings
Increases tvOS deploy target to match FB SDK 5 deploy target

* Updates Changelog

* Fixes Twitter tests

* Updates Changelog
  • Loading branch information
drdaz authored Sep 13, 2019
1 parent 66b8b09 commit 0bb0cd5
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
4 changes: 2 additions & 2 deletions Parse.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ParseTwitterUtils/ParseTwitterUtils/PFTwitterUtils.m
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ + (void)_assertTwitterInitialized {
}

+ (void)_assertParseInitialized {
PFTWConsistencyAssert([Parse getApplicationId],
PFTWConsistencyAssert([Parse applicationId],
@"PFTwitterUtils should be initialized after setting up Parse.");
}

Expand Down
8 changes: 4 additions & 4 deletions ParseTwitterUtils/Tests/Unit/TwitterUtilsTests.m
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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]);

Expand Down

0 comments on commit 0bb0cd5

Please sign in to comment.