Skip to content

Commit f5dd443

Browse files
pengyunchoupengyunchou
authored
Merge pull request #114 from varunpm1/master
Updated project settings to Swift 4
2 parents fd274a8 + 0c5e36b commit f5dd443

File tree

4 files changed

+34
-7
lines changed

4 files changed

+34
-7
lines changed

‎SwiftSocket.xcodeproj/project.pbxproj‎

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@
273273
attributes = {
274274
LastSwiftMigration = 0710;
275275
LastSwiftUpdateCheck = 0810;
276-
LastUpgradeCheck = 0710;
276+
LastUpgradeCheck = 0900;
277277
ORGANIZATIONNAME = swift;
278278
TargetAttributes = {
279279
37454EC91E06158200800AE5 = {
@@ -286,7 +286,7 @@
286286
};
287287
377DAA681DCDE40200009697 = {
288288
CreatedOnToolsVersion = 8.1;
289-
LastSwiftMigration = 0810;
289+
LastSwiftMigration = 0900;
290290
ProvisioningStyle = Manual;
291291
};
292292
377DAA751DCDE45D00009697 = {
@@ -559,7 +559,8 @@
559559
SKIP_INSTALL = YES;
560560
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
561561
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
562-
SWIFT_VERSION = 3.0;
562+
SWIFT_SWIFT3_OBJC_INFERENCE = On;
563+
SWIFT_VERSION = 4.0;
563564
TARGETED_DEVICE_FAMILY = "1,2";
564565
VERSIONING_SYSTEM = "apple-generic";
565566
VERSION_INFO_PREFIX = "";
@@ -593,7 +594,8 @@
593594
SDKROOT = iphoneos;
594595
SKIP_INSTALL = YES;
595596
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
596-
SWIFT_VERSION = 3.0;
597+
SWIFT_SWIFT3_OBJC_INFERENCE = On;
598+
SWIFT_VERSION = 4.0;
597599
TARGETED_DEVICE_FAMILY = "1,2";
598600
VALIDATE_PRODUCT = YES;
599601
VERSIONING_SYSTEM = "apple-generic";
@@ -662,20 +664,29 @@
662664
CLANG_CXX_LIBRARY = "libc++";
663665
CLANG_ENABLE_MODULES = YES;
664666
CLANG_ENABLE_OBJC_ARC = YES;
667+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
665668
CLANG_WARN_BOOL_CONVERSION = YES;
669+
CLANG_WARN_COMMA = YES;
666670
CLANG_WARN_CONSTANT_CONVERSION = YES;
667671
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
668672
CLANG_WARN_EMPTY_BODY = YES;
669673
CLANG_WARN_ENUM_CONVERSION = YES;
674+
CLANG_WARN_INFINITE_RECURSION = YES;
670675
CLANG_WARN_INT_CONVERSION = YES;
676+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
677+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
671678
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
679+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
680+
CLANG_WARN_STRICT_PROTOTYPES = YES;
681+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
672682
CLANG_WARN_UNREACHABLE_CODE = YES;
673683
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
674684
COPY_PHASE_STRIP = NO;
675685
ENABLE_STRICT_OBJC_MSGSEND = YES;
676686
ENABLE_TESTABILITY = YES;
677687
GCC_C_LANGUAGE_STANDARD = gnu99;
678688
GCC_DYNAMIC_NO_PIC = NO;
689+
GCC_NO_COMMON_BLOCKS = YES;
679690
GCC_OPTIMIZATION_LEVEL = 0;
680691
GCC_PREPROCESSOR_DEFINITIONS = (
681692
"DEBUG=1",
@@ -707,19 +718,28 @@
707718
CLANG_CXX_LIBRARY = "libc++";
708719
CLANG_ENABLE_MODULES = YES;
709720
CLANG_ENABLE_OBJC_ARC = YES;
721+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
710722
CLANG_WARN_BOOL_CONVERSION = YES;
723+
CLANG_WARN_COMMA = YES;
711724
CLANG_WARN_CONSTANT_CONVERSION = YES;
712725
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
713726
CLANG_WARN_EMPTY_BODY = YES;
714727
CLANG_WARN_ENUM_CONVERSION = YES;
728+
CLANG_WARN_INFINITE_RECURSION = YES;
715729
CLANG_WARN_INT_CONVERSION = YES;
730+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
731+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
716732
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
733+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
734+
CLANG_WARN_STRICT_PROTOTYPES = YES;
735+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
717736
CLANG_WARN_UNREACHABLE_CODE = YES;
718737
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
719738
COPY_PHASE_STRIP = YES;
720739
ENABLE_NS_ASSERTIONS = NO;
721740
ENABLE_STRICT_OBJC_MSGSEND = YES;
722741
GCC_C_LANGUAGE_STANDARD = gnu99;
742+
GCC_NO_COMMON_BLOCKS = YES;
723743
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
724744
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
725745
GCC_WARN_UNDECLARED_SELECTOR = YES;
@@ -731,6 +751,7 @@
731751
MTL_ENABLE_DEBUG_INFO = NO;
732752
PRODUCT_NAME = "";
733753
SDKROOT = macosx;
754+
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
734755
SWIFT_VERSION = 3.0;
735756
};
736757
name = Release;

‎SwiftSocket.xcodeproj/xcshareddata/xcschemes/SwiftSocket iOS.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 = "0820"
3+
LastUpgradeVersion = "0900"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
language = ""
2930
shouldUseLaunchSchemeArgsEnv = "YES">
3031
<Testables>
3132
</Testables>
@@ -36,6 +37,7 @@
3637
buildConfiguration = "Debug"
3738
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
3839
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
40+
language = ""
3941
launchStyle = "0"
4042
useCustomWorkingDirectory = "NO"
4143
ignoresPersistentStateOnLaunch = "NO"

‎SwiftSocket.xcodeproj/xcshareddata/xcschemes/SwiftSocket macOS.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 = "0820"
3+
LastUpgradeVersion = "0900"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
language = ""
2930
shouldUseLaunchSchemeArgsEnv = "YES">
3031
<Testables>
3132
</Testables>
@@ -36,6 +37,7 @@
3637
buildConfiguration = "Debug"
3738
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
3839
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
40+
language = ""
3941
launchStyle = "0"
4042
useCustomWorkingDirectory = "NO"
4143
ignoresPersistentStateOnLaunch = "NO"

‎SwiftSocket.xcodeproj/xcshareddata/xcschemes/SwiftSocket 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 = "0820"
3+
LastUpgradeVersion = "0900"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
language = ""
2930
shouldUseLaunchSchemeArgsEnv = "YES">
3031
<Testables>
3132
</Testables>
@@ -36,6 +37,7 @@
3637
buildConfiguration = "Debug"
3738
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
3839
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
40+
language = ""
3941
launchStyle = "0"
4042
useCustomWorkingDirectory = "NO"
4143
ignoresPersistentStateOnLaunch = "NO"

0 commit comments

Comments
 (0)