Skip to content
This repository was archived by the owner on Jan 16, 2021. It is now read-only.

Commit 6befbd5

Browse files
committed
Merge pull request #28 from ParsePlatform/nlutsenko.xcode73
Update all dependencies and project to Xcode 7.3.
2 parents 3378fa3 + dbbcdca commit 6befbd5

File tree

12 files changed

+55
-17
lines changed

12 files changed

+55
-17
lines changed

.codecov.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
coverage:
2+
ignore:
3+
- Tests/*
4+
status:
5+
project:
6+
default:
7+
target: 50
8+
patch: off
9+
changes: off
10+
comment: off

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ branches:
33
- master
44
language: objective-c
55
os: osx
6-
osx_image: xcode7.2
6+
osx_image: xcode7.3
77
env:
88
global:
99
- LC_CTYPE=en_US.UTF-8

Configurations/ParseTwitterTestApplication.xcconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#include "Shared/Product/Application.xcconfig"
1212

1313
PRODUCT_NAME = ParseTwitterTestApplication
14+
PRODUCT_BUNDLE_IDENTIFIER = com.parse.twitterutils.testapplication
1415

1516
INFOPLIST_FILE = $(SRCROOT)/Tests/TestApplication/Resources/Info.plist
1617

Configurations/ParseTwitterUtils-iOS.xcconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#include "Shared/Product/Framework.xcconfig"
1212

1313
PRODUCT_NAME = ParseTwitterUtils
14+
PRODUCT_BUNDLE_IDENTIFIER = com.parse.twitterutils
1415

1516
MACH_O_TYPE = staticlib
1617
DEFINES_MODULE = YES

Gemfile.lock

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
activesupport (4.2.5)
4+
activesupport (4.2.6)
55
i18n (~> 0.7)
66
json (~> 1.7, >= 1.7.7)
77
minitest (~> 5.1)
@@ -41,12 +41,12 @@ GEM
4141
fuzzy_match (2.0.4)
4242
i18n (0.7.0)
4343
json (1.8.3)
44-
minitest (5.8.3)
45-
molinillo (0.4.0)
46-
nap (1.0.0)
44+
minitest (5.8.4)
45+
molinillo (0.4.4)
46+
nap (1.1.0)
4747
naturally (2.1.0)
4848
netrc (0.7.8)
49-
rake (10.4.2)
49+
rake (11.1.2)
5050
rouge (1.10.1)
5151
thread_safe (0.3.5)
5252
tzinfo (1.2.2)
@@ -55,7 +55,7 @@ GEM
5555
activesupport (>= 3)
5656
claide (~> 0.9.1)
5757
colored (~> 1.2)
58-
xcpretty (0.2.1)
58+
xcpretty (0.2.2)
5959
rouge (~> 1.8)
6060

6161
PLATFORMS
@@ -68,4 +68,4 @@ DEPENDENCIES
6868
xcpretty
6969

7070
BUNDLED WITH
71-
1.10.6
71+
1.11.2

ParseTwitterUtils.xcodeproj/project.pbxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -490,7 +490,7 @@
490490
isa = PBXProject;
491491
attributes = {
492492
CLASSPREFIX = PF;
493-
LastUpgradeCheck = 0720;
493+
LastUpgradeCheck = 0730;
494494
ORGANIZATIONNAME = "Parse, LLC";
495495
TargetAttributes = {
496496
8166FB661B4F1D77003841A2 = {

ParseTwitterUtils.xcodeproj/xcshareddata/xcschemes/ParseTwitterUtils-iOS.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0720"
3+
LastUpgradeVersion = "0730"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

ParseTwitterUtils/Internal/Dialog/PFOAuth1FlowDialog.m

Lines changed: 29 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,32 @@ static BOOL PFOAuth1FlowDialogIsDevicePad() {
5555
return isPad;
5656
}
5757

58+
static CGFloat PFTFloatRound(CGFloat value, NSRoundingMode mode) {
59+
switch (mode) {
60+
case NSRoundPlain:
61+
case NSRoundBankers:
62+
#if CGFLOAT_IS_DOUBLE
63+
value = round(value);
64+
#else
65+
value = roundf(value);
66+
#endif
67+
case NSRoundDown:
68+
#if CGFLOAT_IS_DOUBLE
69+
value = floor(value);
70+
#else
71+
value = floorf(value);
72+
#endif
73+
case NSRoundUp:
74+
#if CGFLOAT_IS_DOUBLE
75+
value = ceil(value);
76+
#else
77+
value = ceilf(value);
78+
#endif
79+
default: break;
80+
}
81+
return value;
82+
}
83+
5884
#pragma mark -
5985
#pragma mark Class
6086

@@ -461,7 +487,7 @@ - (void)_removeObservers {
461487
- (void)_deviceOrientationDidChange:(NSNotification *)notification {
462488
UIInterfaceOrientation orientation = [UIApplication sharedApplication].statusBarOrientation;
463489
if ([self _shouldRotateToOrientation:orientation]) {
464-
CGFloat duration = [UIApplication sharedApplication].statusBarOrientationAnimationDuration;
490+
NSTimeInterval duration = [UIApplication sharedApplication].statusBarOrientationAnimationDuration;
465491
[UIView animateWithDuration:duration
466492
animations:^{
467493
[self _sizeToFitOrientation];
@@ -518,8 +544,8 @@ - (void)_sizeToFitOrientation {
518544

519545
CGFloat scale = (PFOAuth1FlowDialogIsDevicePad() ? 0.6f : 1.0f);
520546

521-
CGFloat width = floor(scale * CGRectGetWidth(transformedBounds)) - PFOAuth1FlowDialogScreenInset * 2.0f;
522-
CGFloat height = floor(scale * CGRectGetHeight(transformedBounds)) - PFOAuth1FlowDialogScreenInset * 2.0f;
547+
CGFloat width = PFTFloatRound((scale * CGRectGetWidth(transformedBounds)) - PFOAuth1FlowDialogScreenInset * 2.0f, NSRoundDown);
548+
CGFloat height = PFTFloatRound((scale * CGRectGetHeight(transformedBounds)) - PFOAuth1FlowDialogScreenInset * 2.0f, NSRoundDown);
523549

524550
self.transform = transform;
525551
self.center = center;

Resources/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<key>CFBundleExecutable</key>
88
<string>ParseTwitterUtils</string>
99
<key>CFBundleIdentifier</key>
10-
<string>com.parse.twitterutils</string>
10+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
1111
<key>CFBundleInfoDictionaryVersion</key>
1212
<string>6.0</string>
1313
<key>CFBundlePackageType</key>

Tests/Resources/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<key>CFBundleExecutable</key>
88
<string>$(EXECUTABLE_NAME)</string>
99
<key>CFBundleIdentifier</key>
10-
<string>com.parse.$(PRODUCT_NAME:rfc1034identifier)</string>
10+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
1111
<key>CFBundleInfoDictionaryVersion</key>
1212
<string>6.0</string>
1313
<key>CFBundleName</key>

0 commit comments

Comments
 (0)