Skip to content

Commit 358e44a

Browse files
nuclearacenuclearace
committed
Update xcodeproj after rebase
1 parent 2f92a69 commit 358e44a

File tree

5 files changed

+39
-13
lines changed

5 files changed

+39
-13
lines changed

‎Socket.IO-Client-Swift.xcodeproj/project.pbxproj

Lines changed: 31 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -657,7 +657,7 @@
657657
attributes = {
658658
LastSwiftMigration = 0730;
659659
LastSwiftUpdateCheck = 0730;
660-
LastUpgradeCheck = 0800;
660+
LastUpgradeCheck = 0900;
661661
TargetAttributes = {
662662
572EF2181B51F16C00EEBB58 = {
663663
CreatedOnToolsVersion = 6.4;
@@ -667,11 +667,11 @@
667667
};
668668
572EF2371B51F18A00EEBB58 = {
669669
CreatedOnToolsVersion = 6.4;
670-
LastSwiftMigration = 0800;
670+
LastSwiftMigration = 0900;
671671
};
672672
572EF2411B51F18A00EEBB58 = {
673673
CreatedOnToolsVersion = 6.4;
674-
LastSwiftMigration = 0800;
674+
LastSwiftMigration = 0900;
675675
};
676676
};
677677
};
@@ -958,11 +958,19 @@
958958
isa = XCBuildConfiguration;
959959
buildSettings = {
960960
BITCODE_GENERATION_MODE = bitcode;
961+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
961962
CLANG_WARN_BOOL_CONVERSION = YES;
963+
CLANG_WARN_COMMA = YES;
962964
CLANG_WARN_CONSTANT_CONVERSION = YES;
963965
CLANG_WARN_EMPTY_BODY = YES;
964966
CLANG_WARN_ENUM_CONVERSION = YES;
967+
CLANG_WARN_INFINITE_RECURSION = YES;
965968
CLANG_WARN_INT_CONVERSION = YES;
969+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
970+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
971+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
972+
CLANG_WARN_STRICT_PROTOTYPES = YES;
973+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
966974
CLANG_WARN_UNREACHABLE_CODE = YES;
967975
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
968976
CODE_SIGN_IDENTITY = "Developer ID Application";
@@ -992,11 +1000,19 @@
9921000
isa = XCBuildConfiguration;
9931001
buildSettings = {
9941002
BITCODE_GENERATION_MODE = bitcode;
1003+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
9951004
CLANG_WARN_BOOL_CONVERSION = YES;
1005+
CLANG_WARN_COMMA = YES;
9961006
CLANG_WARN_CONSTANT_CONVERSION = YES;
9971007
CLANG_WARN_EMPTY_BODY = YES;
9981008
CLANG_WARN_ENUM_CONVERSION = YES;
1009+
CLANG_WARN_INFINITE_RECURSION = YES;
9991010
CLANG_WARN_INT_CONVERSION = YES;
1011+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
1012+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
1013+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
1014+
CLANG_WARN_STRICT_PROTOTYPES = YES;
1015+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
10001016
CLANG_WARN_UNREACHABLE_CODE = YES;
10011017
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
10021018
CODE_SIGN_IDENTITY = "Developer ID Application";
@@ -1038,7 +1054,7 @@
10381054
CLANG_WARN_UNREACHABLE_CODE = YES;
10391055
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
10401056
CODE_SIGN_IDENTITY = "iPhone Developer";
1041-
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
1057+
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
10421058
COPY_PHASE_STRIP = NO;
10431059
CURRENT_PROJECT_VERSION = 1;
10441060
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
@@ -1097,7 +1113,7 @@
10971113
CLANG_WARN_UNREACHABLE_CODE = YES;
10981114
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
10991115
CODE_SIGN_IDENTITY = "iPhone Distribution";
1100-
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
1116+
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
11011117
COPY_PHASE_STRIP = NO;
11021118
CURRENT_PROJECT_VERSION = 1;
11031119
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
@@ -1285,7 +1301,8 @@
12851301
SKIP_INSTALL = YES;
12861302
SWIFT_INCLUDE_PATHS = "";
12871303
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1288-
SWIFT_VERSION = 3.0;
1304+
SWIFT_SWIFT3_OBJC_INFERENCE = On;
1305+
SWIFT_VERSION = 4.0;
12891306
VERSIONING_SYSTEM = "apple-generic";
12901307
VERSION_INFO_PREFIX = "";
12911308
};
@@ -1342,7 +1359,8 @@
13421359
SDKROOT = macosx;
13431360
SKIP_INSTALL = YES;
13441361
SWIFT_INCLUDE_PATHS = "";
1345-
SWIFT_VERSION = 3.0;
1362+
SWIFT_SWIFT3_OBJC_INFERENCE = On;
1363+
SWIFT_VERSION = 4.0;
13461364
VERSIONING_SYSTEM = "apple-generic";
13471365
VERSION_INFO_PREFIX = "";
13481366
};
@@ -1403,7 +1421,8 @@
14031421
PRODUCT_NAME = "$(TARGET_NAME)";
14041422
SDKROOT = macosx;
14051423
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1406-
SWIFT_VERSION = 3.0;
1424+
SWIFT_SWIFT3_OBJC_INFERENCE = On;
1425+
SWIFT_VERSION = 4.0;
14071426
};
14081427
name = Debug;
14091428
};
@@ -1454,7 +1473,8 @@
14541473
PRODUCT_BUNDLE_IDENTIFIER = "io.socket.$(PRODUCT_NAME:rfc1034identifier)";
14551474
PRODUCT_NAME = "$(TARGET_NAME)";
14561475
SDKROOT = macosx;
1457-
SWIFT_VERSION = 3.0;
1476+
SWIFT_SWIFT3_OBJC_INFERENCE = On;
1477+
SWIFT_VERSION = 4.0;
14581478
};
14591479
name = Release;
14601480
};
@@ -1476,6 +1496,7 @@
14761496
CLANG_WARN_UNREACHABLE_CODE = YES;
14771497
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
14781498
CODE_SIGN_IDENTITY = "iPhone Developer";
1499+
"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
14791500
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
14801501
COPY_PHASE_STRIP = NO;
14811502
CURRENT_PROJECT_VERSION = 1;
@@ -1535,6 +1556,7 @@
15351556
CLANG_WARN_UNREACHABLE_CODE = YES;
15361557
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
15371558
CODE_SIGN_IDENTITY = "iPhone Distribution";
1559+
"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
15381560
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
15391561
COPY_PHASE_STRIP = NO;
15401562
CURRENT_PROJECT_VERSION = 1;

‎Socket.IO-Client-Swift.xcodeproj/xcshareddata/xcschemes/SocketIO-Mac.xcscheme

Lines changed: 3 additions & 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 = "0800"
3+
LastUpgradeVersion = "0900"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -40,6 +40,7 @@
4040
buildConfiguration = "Debug"
4141
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4242
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
43+
language = ""
4344
shouldUseLaunchSchemeArgsEnv = "YES">
4445
<Testables>
4546
<TestableReference
@@ -69,6 +70,7 @@
6970
buildConfiguration = "Debug"
7071
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
7172
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
73+
language = ""
7274
launchStyle = "0"
7375
useCustomWorkingDirectory = "NO"
7476
ignoresPersistentStateOnLaunch = "NO"

‎Socket.IO-Client-Swift.xcodeproj/xcshareddata/xcschemes/SocketIO-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 = "0800"
3+
LastUpgradeVersion = "0900"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Socket.IO-Client-Swift.xcodeproj/xcshareddata/xcschemes/SocketIO-tvOS.xcscheme

Lines changed: 3 additions & 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 = "0800"
3+
LastUpgradeVersion = "0900"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -40,6 +40,7 @@
4040
buildConfiguration = "Debug"
4141
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4242
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
43+
language = ""
4344
shouldUseLaunchSchemeArgsEnv = "YES">
4445
<Testables>
4546
<TestableReference
@@ -69,6 +70,7 @@
6970
buildConfiguration = "Debug"
7071
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
7172
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
73+
language = ""
7274
launchStyle = "0"
7375
useCustomWorkingDirectory = "NO"
7476
ignoresPersistentStateOnLaunch = "NO"

‎Source/Starscream

0 commit comments

Comments
 (0)