Skip to content

Commit de89ed1

Browse files
chrisballingerchrisballinger
authored
Merge pull request #1057 from robbiehanson/travis_xcode9.3
Dependency Updates & Xcode 9.4
2 parents 6a2754e + e027af9 commit de89ed1

28 files changed

+159
-204
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ DerivedData
99
*.orig
1010
*.xccheckout
1111
*.xcscmblueprint
12+
XMPPFramework*.zip
1213

1314
Pods/
1415
Carthage/

‎.travis.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
osx_image: xcode9.1
1+
osx_image: xcode9.3
22
language: objective-c
33

44
cache:
@@ -10,7 +10,7 @@ cache:
1010
before_install:
1111
# - brew update
1212
# - brew outdated carthage || brew upgrade carthage
13-
- export IOS_SIMULATOR_DESTINATION="platform=iOS Simulator,name=iPhone 8,OS=11.1"
13+
- export IOS_SIMULATOR_DESTINATION="platform=iOS Simulator,name=iPhone 8,OS=11.3"
1414

1515
install:
1616
- carthage bootstrap --no-build

‎Cartfile.resolved‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
github "CocoaLumberjack/CocoaLumberjack" "3.3.0"
2-
github "chrisballinger/libidn-framework" "1.33.1"
3-
github "robbiehanson/CocoaAsyncSocket" "7.6.2"
4-
github "robbiehanson/KissXML" "5.2.1"
1+
github "CocoaLumberjack/CocoaLumberjack" "3.4.2"
2+
github "chrisballinger/libidn-framework" "1.35"
3+
github "robbiehanson/CocoaAsyncSocket" "7.6.3"
4+
github "robbiehanson/KissXML" "5.2.3"

‎XMPPFramework.podspec‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ Pod::Spec.new do |s|
3636
}
3737
ss.resources = [ 'Extensions/**/*.{xcdatamodel,xcdatamodeld}']
3838
ss.dependency 'CocoaLumberjack' # Skip pinning version because of the awkward 2.x->3.x transition
39-
ss.dependency 'CocoaAsyncSocket', '~> 7.6.0'
40-
ss.dependency 'KissXML', '~> 5.2.0'
41-
ss.dependency 'libidn', '~> 1.33.0'
39+
ss.dependency 'CocoaAsyncSocket', '~> 7.6'
40+
ss.dependency 'KissXML', '~> 5.2'
41+
ss.dependency 'libidn', '~> 1.35'
4242
end
4343

4444
s.subspec 'Swift' do |ss|

‎XMPPFramework.xcodeproj/project.pbxproj‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3684,7 +3684,7 @@
36843684
isa = PBXProject;
36853685
attributes = {
36863686
CLASSPREFIX = XMPP;
3687-
LastUpgradeCheck = 0910;
3687+
LastUpgradeCheck = 0940;
36883688
ORGANIZATIONNAME = XMPPFramework;
36893689
TargetAttributes = {
36903690
0D44BAE91E537066000930E0 = {
@@ -4692,13 +4692,15 @@
46924692
CLANG_WARN_BOOL_CONVERSION = YES;
46934693
CLANG_WARN_COMMA = YES;
46944694
CLANG_WARN_CONSTANT_CONVERSION = YES;
4695+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
46954696
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
46964697
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
46974698
CLANG_WARN_EMPTY_BODY = YES;
46984699
CLANG_WARN_ENUM_CONVERSION = YES;
46994700
CLANG_WARN_INFINITE_RECURSION = YES;
47004701
CLANG_WARN_INT_CONVERSION = YES;
47014702
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
4703+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
47024704
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
47034705
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
47044706
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -4754,13 +4756,15 @@
47544756
CLANG_WARN_BOOL_CONVERSION = YES;
47554757
CLANG_WARN_COMMA = YES;
47564758
CLANG_WARN_CONSTANT_CONVERSION = YES;
4759+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
47574760
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
47584761
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
47594762
CLANG_WARN_EMPTY_BODY = YES;
47604763
CLANG_WARN_ENUM_CONVERSION = YES;
47614764
CLANG_WARN_INFINITE_RECURSION = YES;
47624765
CLANG_WARN_INT_CONVERSION = YES;
47634766
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
4767+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
47644768
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
47654769
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
47664770
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -4971,6 +4975,7 @@
49714975
PROVISIONING_PROFILE_SPECIFIER = "";
49724976
SDKROOT = appletvos;
49734977
SKIP_INSTALL = YES;
4978+
TARGETED_DEVICE_FAMILY = 3;
49744979
TVOS_DEPLOYMENT_TARGET = 9.0;
49754980
};
49764981
name = Debug;
@@ -4998,6 +5003,7 @@
49985003
PROVISIONING_PROFILE_SPECIFIER = "";
49995004
SDKROOT = appletvos;
50005005
SKIP_INSTALL = YES;
5006+
TARGETED_DEVICE_FAMILY = 3;
50015007
TVOS_DEPLOYMENT_TARGET = 9.0;
50025008
};
50035009
name = Release;
@@ -5080,6 +5086,7 @@
50805086
SDKROOT = appletvos;
50815087
SKIP_INSTALL = YES;
50825088
SWIFT_VERSION = 3.0;
5089+
TARGETED_DEVICE_FAMILY = 3;
50835090
TVOS_DEPLOYMENT_TARGET = 9.0;
50845091
};
50855092
name = Debug;
@@ -5108,6 +5115,7 @@
51085115
SDKROOT = appletvos;
51095116
SKIP_INSTALL = YES;
51105117
SWIFT_VERSION = 3.0;
5118+
TARGETED_DEVICE_FAMILY = 3;
51115119
TVOS_DEPLOYMENT_TARGET = 9.0;
51125120
};
51135121
name = Release;

‎XMPPFramework.xcodeproj/xcshareddata/xcschemes/XMPPFramework (iOS).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 = "0910"
3+
LastUpgradeVersion = "0940"
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"

‎XMPPFramework.xcodeproj/xcshareddata/xcschemes/XMPPFramework (macOS).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 = "0910"
3+
LastUpgradeVersion = "0940"
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"

‎XMPPFramework.xcodeproj/xcshareddata/xcschemes/XMPPFramework (tvOS).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 = "0910"
3+
LastUpgradeVersion = "0940"
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"

‎XMPPFramework.xcodeproj/xcshareddata/xcschemes/XMPPFrameworkSwift (iOS).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 = "0910"
3+
LastUpgradeVersion = "0940"
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"

‎XMPPFramework.xcodeproj/xcshareddata/xcschemes/XMPPFrameworkSwift (macOS).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 = "0910"
3+
LastUpgradeVersion = "0940"
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)