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

Update all dependencies and project to Xcode 7.3. #28

Merged
merged 7 commits into from
Apr 28, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions .codecov.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
coverage:
ignore:
- Tests/*
status:
project:
default:
target: 50
patch: off
changes: off
comment: off
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ branches:
- master
language: objective-c
os: osx
osx_image: xcode7.2
osx_image: xcode7.3
env:
global:
- LC_CTYPE=en_US.UTF-8
Expand Down
1 change: 1 addition & 0 deletions Configurations/ParseTwitterTestApplication.xcconfig
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#include "Shared/Product/Application.xcconfig"

PRODUCT_NAME = ParseTwitterTestApplication
PRODUCT_BUNDLE_IDENTIFIER = com.parse.twitterutils.testapplication

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

Expand Down
1 change: 1 addition & 0 deletions Configurations/ParseTwitterUtils-iOS.xcconfig
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#include "Shared/Product/Framework.xcconfig"

PRODUCT_NAME = ParseTwitterUtils
PRODUCT_BUNDLE_IDENTIFIER = com.parse.twitterutils

MACH_O_TYPE = staticlib
DEFINES_MODULE = YES
Expand Down
14 changes: 7 additions & 7 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
GEM
remote: https://rubygems.org/
specs:
activesupport (4.2.5)
activesupport (4.2.6)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
Expand Down Expand Up @@ -41,12 +41,12 @@ GEM
fuzzy_match (2.0.4)
i18n (0.7.0)
json (1.8.3)
minitest (5.8.3)
molinillo (0.4.0)
nap (1.0.0)
minitest (5.8.4)
molinillo (0.4.4)
nap (1.1.0)
naturally (2.1.0)
netrc (0.7.8)
rake (10.4.2)
rake (11.1.2)
rouge (1.10.1)
thread_safe (0.3.5)
tzinfo (1.2.2)
Expand All @@ -55,7 +55,7 @@ GEM
activesupport (>= 3)
claide (~> 0.9.1)
colored (~> 1.2)
xcpretty (0.2.1)
xcpretty (0.2.2)
rouge (~> 1.8)

PLATFORMS
Expand All @@ -68,4 +68,4 @@ DEPENDENCIES
xcpretty

BUNDLED WITH
1.10.6
1.11.2
2 changes: 1 addition & 1 deletion ParseTwitterUtils.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -490,7 +490,7 @@
isa = PBXProject;
attributes = {
CLASSPREFIX = PF;
LastUpgradeCheck = 0720;
LastUpgradeCheck = 0730;
ORGANIZATIONNAME = "Parse, LLC";
TargetAttributes = {
8166FB661B4F1D77003841A2 = {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0720"
LastUpgradeVersion = "0730"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
32 changes: 29 additions & 3 deletions ParseTwitterUtils/Internal/Dialog/PFOAuth1FlowDialog.m
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,32 @@ static BOOL PFOAuth1FlowDialogIsDevicePad() {
return isPad;
}

static CGFloat PFTFloatRound(CGFloat value, NSRoundingMode mode) {
switch (mode) {
case NSRoundPlain:
case NSRoundBankers:
#if CGFLOAT_IS_DOUBLE
value = round(value);
#else
value = roundf(value);
#endif
case NSRoundDown:
#if CGFLOAT_IS_DOUBLE
value = floor(value);
#else
value = floorf(value);
#endif
case NSRoundUp:
#if CGFLOAT_IS_DOUBLE
value = ceil(value);
#else
value = ceilf(value);
#endif
default: break;
}
return value;
}

#pragma mark -
#pragma mark Class

Expand Down Expand Up @@ -461,7 +487,7 @@ - (void)_removeObservers {
- (void)_deviceOrientationDidChange:(NSNotification *)notification {
UIInterfaceOrientation orientation = [UIApplication sharedApplication].statusBarOrientation;
if ([self _shouldRotateToOrientation:orientation]) {
CGFloat duration = [UIApplication sharedApplication].statusBarOrientationAnimationDuration;
NSTimeInterval duration = [UIApplication sharedApplication].statusBarOrientationAnimationDuration;
[UIView animateWithDuration:duration
animations:^{
[self _sizeToFitOrientation];
Expand Down Expand Up @@ -518,8 +544,8 @@ - (void)_sizeToFitOrientation {

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

CGFloat width = floor(scale * CGRectGetWidth(transformedBounds)) - PFOAuth1FlowDialogScreenInset * 2.0f;
CGFloat height = floor(scale * CGRectGetHeight(transformedBounds)) - PFOAuth1FlowDialogScreenInset * 2.0f;
CGFloat width = PFTFloatRound((scale * CGRectGetWidth(transformedBounds)) - PFOAuth1FlowDialogScreenInset * 2.0f, NSRoundDown);
CGFloat height = PFTFloatRound((scale * CGRectGetHeight(transformedBounds)) - PFOAuth1FlowDialogScreenInset * 2.0f, NSRoundDown);

self.transform = transform;
self.center = center;
Expand Down
2 changes: 1 addition & 1 deletion Resources/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>ParseTwitterUtils</string>
<key>CFBundleIdentifier</key>
<string>com.parse.twitterutils</string>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundlePackageType</key>
Expand Down
2 changes: 1 addition & 1 deletion Tests/Resources/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>com.parse.$(PRODUCT_NAME:rfc1034identifier)</string>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
Expand Down
2 changes: 1 addition & 1 deletion Tests/TestApplication/Resources/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<key>CFBundleIcons~ipad</key>
<dict/>
<key>CFBundleIdentifier</key>
<string>com.parse.$(PRODUCT_NAME:rfc1034identifier)</string>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
Expand Down
2 changes: 1 addition & 1 deletion Vendor/xctoolchain