Skip to content

Commit 646048e

Browse files
flovilmartflovilmart
authored
Xcode 9.3 (#1292)
* Bumps minimum FB SDK version * wip * Compatibility with xcode 9.3 * Fixes enums warnings * allow warns
1 parent 6d27d1a commit 646048e

File tree

53 files changed

+217
-194
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+217
-194
lines changed

‎.gitmodules‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@
99
url = https://github.com/erikdoe/OCMock.git
1010
[submodule "Carthage/Checkouts/facebook-ios-sdk"]
1111
path = Carthage/Checkouts/facebook-ios-sdk
12-
url = https://github.com/facebook/facebook-ios-sdk
12+
url = https://github.com/facebook/facebook-ios-sdk.git

‎Cartfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
github "BoltsFramework/Bolts-ObjC" ~> 1.9
2-
github "facebook/facebook-ios-sdk" ~> 4.30
2+
github "facebook/facebook-ios-sdk" ~> 4.29
33

‎Cartfile.resolved‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
github "BoltsFramework/Bolts-ObjC" "1.9.0"
22
github "erikdoe/OCMock" "v3.4.1"
3-
github "facebook/facebook-ios-sdk" "sdk-version-4.30.0"
4-
3+
github "facebook/facebook-ios-sdk" "sdk-version-4.32.0"

‎Carthage/Checkouts/facebook-ios-sdk‎

Submodule facebook-ios-sdk updated 32 files

‎Gemfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ gem 'plist'
55
gem 'naturally', '~> 1.3.2'
66
gem 'xcpretty'
77
gem 'xcodeproj'
8-
gem 'cocoapods', '~> 1.4.0'
8+
gem 'cocoapods', '~> 1.5.0'
99
gem 'jazzy', '~> 0.9.0'

‎Gemfile.lock‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
CFPropertyList (2.3.6)
4+
CFPropertyList (3.0.0)
55
activesupport (4.2.10)
66
i18n (~> 0.7)
77
minitest (~> 5.1)
88
thread_safe (~> 0.3, >= 0.3.4)
99
tzinfo (~> 1.1)
1010
atomos (0.1.2)
1111
claide (1.0.2)
12-
cocoapods (1.4.0)
12+
cocoapods (1.5.0)
1313
activesupport (>= 4.0.2, < 5)
1414
claide (>= 1.0.2, < 2.0)
15-
cocoapods-core (= 1.4.0)
15+
cocoapods-core (= 1.5.0)
1616
cocoapods-deintegrate (>= 1.0.2, < 2.0)
17-
cocoapods-downloader (>= 1.1.3, < 2.0)
17+
cocoapods-downloader (>= 1.2.0, < 2.0)
1818
cocoapods-plugins (>= 1.0.0, < 2.0)
1919
cocoapods-search (>= 1.0.0, < 2.0)
2020
cocoapods-stats (>= 1.0.0, < 2.0)
@@ -24,16 +24,16 @@ GEM
2424
escape (~> 0.0.4)
2525
fourflusher (~> 2.0.1)
2626
gh_inspector (~> 1.0)
27-
molinillo (~> 0.6.4)
27+
molinillo (~> 0.6.5)
2828
nap (~> 1.0)
2929
ruby-macho (~> 1.1)
30-
xcodeproj (>= 1.5.4, < 2.0)
31-
cocoapods-core (1.4.0)
30+
xcodeproj (>= 1.5.7, < 2.0)
31+
cocoapods-core (1.5.0)
3232
activesupport (>= 4.0.2, < 6)
3333
fuzzy_match (~> 2.0.4)
3434
nap (~> 1.0)
3535
cocoapods-deintegrate (1.0.2)
36-
cocoapods-downloader (1.1.3)
36+
cocoapods-downloader (1.2.0)
3737
cocoapods-plugins (1.0.0)
3838
nap
3939
cocoapods-search (1.0.0)
@@ -62,9 +62,9 @@ GEM
6262
xcinvoke (~> 0.3.0)
6363
liferaft (0.0.6)
6464
minitest (5.11.3)
65-
molinillo (0.6.4)
65+
molinillo (0.6.5)
6666
mustache (0.99.8)
67-
nanaimo (0.2.3)
67+
nanaimo (0.2.5)
6868
nap (1.1.0)
6969
naturally (1.3.2)
7070
netrc (0.11.0)
@@ -88,20 +88,20 @@ GEM
8888
thread_safe (~> 0.1)
8989
xcinvoke (0.3.0)
9090
liferaft (~> 0.0.6)
91-
xcodeproj (1.5.6)
92-
CFPropertyList (~> 2.3.3)
91+
xcodeproj (1.5.7)
92+
CFPropertyList (>= 2.3.3, < 4.0)
9393
atomos (~> 0.1.2)
9494
claide (>= 1.0.2, < 2.0)
9595
colored2 (~> 3.1)
96-
nanaimo (~> 0.2.3)
96+
nanaimo (~> 0.2.4)
9797
xcpretty (0.2.2)
9898
rouge (~> 1.8)
9999

100100
PLATFORMS
101101
ruby
102102

103103
DEPENDENCIES
104-
cocoapods (~> 1.4.0)
104+
cocoapods (~> 1.5.0)
105105
jazzy (~> 0.9.0)
106106
naturally (~> 1.3.2)
107107
plist

‎Parse.podspec‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Pod::Spec.new do |s|
77
s.authors = 'Parse Community'
88
s.social_media_url = 'https://twitter.com/ParsePlatform'
99

10-
s.source = { :git => "https://github.com/parse-community/Parse-SDK-iOS-OSX.git", :tag => s.version.to_s }
10+
s.source = { :git => 'https://github.com/parse-community/Parse-SDK-iOS-OSX.git', :tag => s.version.to_s }
1111

1212
s.platform = :ios, :osx, :tvos, :watchos
1313
s.ios.deployment_target = '8.0'
@@ -115,10 +115,11 @@ Pod::Spec.new do |s|
115115
s.libraries = 'z', 'sqlite3'
116116

117117
s.dependency 'Parse/Core'
118-
s.dependency 'FBSDKCoreKit', '~> 4.28.0'
119-
s.ios.dependency 'FBSDKLoginKit', '~> 4.28.0'
120-
s.tvos.dependency 'FBSDKTVOSKit', '~> 4.28.0'
121-
s.tvos.dependency 'FBSDKShareKit', '~> 4.28.0'
118+
s.dependency 'Bolts', '~> 1.9'
119+
s.dependency 'FBSDKCoreKit', '~> 4.29'
120+
s.ios.dependency 'FBSDKLoginKit', '~> 4.29'
121+
s.tvos.dependency 'FBSDKTVOSKit', '~> 4.29'
122+
s.tvos.dependency 'FBSDKShareKit', '4.28'
122123
end
123124

124125
s.subspec 'TwitterUtils' do |s|
@@ -145,7 +146,7 @@ Pod::Spec.new do |s|
145146
s.platform = :ios
146147
s.requires_arc = true
147148
s.ios.deployment_target = '9.0'
148-
s.source_files = "ParseUI/**/*.{h,m}"
149+
s.source_files = 'ParseUI/**/*.{h,m}'
149150
s.exclude_files = 'ParseUI/ParseUIDemo/**/*', 'ParseUI/Other/ParseUI.h'
150151
s.public_header_files = 'ParseUI/Classes/LogInViewController/*.h',
151152
'ParseUI/Classes/SignUpViewController/*.h',

‎Parse.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>IDEDidComputeMac32BitWarning</key>
6+
<true/>
7+
</dict>
8+
</plist>

‎Parse/Parse.xcodeproj/project.pbxproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6921,7 +6921,7 @@
69216921
isa = PBXProject;
69226922
attributes = {
69236923
LastSwiftUpdateCheck = 0700;
6924-
LastUpgradeCheck = 0900;
6924+
LastUpgradeCheck = 0930;
69256925
ORGANIZATIONNAME = "Parse Inc.";
69266926
TargetAttributes = {
69276927
4AE33A0A1F5451AD0088DCA0 = {
@@ -8639,6 +8639,7 @@
86398639
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
86408640
CLANG_WARN_STRICT_PROTOTYPES = YES;
86418641
CLANG_WARN_SUSPICIOUS_MOVE = YES;
8642+
SWIFT_COMPILATION_MODE = wholemodule;
86428643
};
86438644
name = Release;
86448645
};

‎Parse/Parse.xcodeproj/xcshareddata/xcschemes/Parse-iOS-Dynamic.xcscheme‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0920"
3+
LastUpgradeVersion = "0930"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
language = ""
3029
shouldUseLaunchSchemeArgsEnv = "YES">
3130
<Testables>
3231
</Testables>
@@ -37,7 +36,6 @@
3736
buildConfiguration = "Debug"
3837
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
3938
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
40-
language = ""
4139
launchStyle = "0"
4240
useCustomWorkingDirectory = "NO"
4341
ignoresPersistentStateOnLaunch = "NO"

0 commit comments

Comments
 (0)