Skip to content

Commit 4cd2a94

Browse files
QataQata
committed
Update to Swift 4
1 parent 5859d00 commit 4cd2a94

File tree

5 files changed

+37
-7
lines changed

5 files changed

+37
-7
lines changed

‎ReactiveReSwift.xcodeproj/project.pbxproj‎

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@
452452
isa = PBXProject;
453453
attributes = {
454454
LastSwiftUpdateCheck = 0720;
455-
LastUpgradeCheck = 0810;
455+
LastUpgradeCheck = 0900;
456456
ORGANIZATIONNAME = "Benjamin Encz";
457457
TargetAttributes = {
458458
25DBCF361C30BF2B00D63A58 = {
@@ -466,11 +466,11 @@
466466
};
467467
25DBCF7A1C30C4AA00D63A58 = {
468468
CreatedOnToolsVersion = 7.2;
469-
LastSwiftMigration = 0800;
469+
LastSwiftMigration = 0900;
470470
};
471471
25DBCF861C30C4DB00D63A58 = {
472472
CreatedOnToolsVersion = 7.2;
473-
LastSwiftMigration = 0800;
473+
LastSwiftMigration = 0900;
474474
};
475475
625E66821C1FF97E0027C288 = {
476476
CreatedOnToolsVersion = 7.1.1;
@@ -845,6 +845,8 @@
845845
PRODUCT_NAME = ReactiveReSwift;
846846
SDKROOT = macosx;
847847
SKIP_INSTALL = YES;
848+
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
849+
SWIFT_VERSION = 4.0;
848850
};
849851
name = Debug;
850852
};
@@ -865,6 +867,8 @@
865867
PRODUCT_NAME = ReactiveReSwift;
866868
SDKROOT = macosx;
867869
SKIP_INSTALL = YES;
870+
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
871+
SWIFT_VERSION = 4.0;
868872
};
869873
name = Release;
870874
};
@@ -879,6 +883,8 @@
879883
PRODUCT_BUNDLE_IDENTIFIER = "reswift.github.io.ReSwift-MacTests";
880884
PRODUCT_NAME = "$(TARGET_NAME)";
881885
SDKROOT = macosx;
886+
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
887+
SWIFT_VERSION = 4.0;
882888
};
883889
name = Debug;
884890
};
@@ -893,6 +899,8 @@
893899
PRODUCT_BUNDLE_IDENTIFIER = "reswift.github.io.ReSwift-MacTests";
894900
PRODUCT_NAME = "$(TARGET_NAME)";
895901
SDKROOT = macosx;
902+
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
903+
SWIFT_VERSION = 4.0;
896904
};
897905
name = Release;
898906
};
@@ -904,14 +912,20 @@
904912
CLANG_CXX_LIBRARY = "libc++";
905913
CLANG_ENABLE_MODULES = YES;
906914
CLANG_ENABLE_OBJC_ARC = YES;
915+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
907916
CLANG_WARN_BOOL_CONVERSION = YES;
917+
CLANG_WARN_COMMA = YES;
908918
CLANG_WARN_CONSTANT_CONVERSION = YES;
909919
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
910920
CLANG_WARN_EMPTY_BODY = YES;
911921
CLANG_WARN_ENUM_CONVERSION = YES;
912922
CLANG_WARN_INFINITE_RECURSION = YES;
913923
CLANG_WARN_INT_CONVERSION = YES;
924+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
925+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
914926
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
927+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
928+
CLANG_WARN_STRICT_PROTOTYPES = YES;
915929
CLANG_WARN_SUSPICIOUS_MOVE = YES;
916930
CLANG_WARN_UNREACHABLE_CODE = YES;
917931
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -945,6 +959,7 @@
945959
PRODUCT_NAME = ReactiveReSwift;
946960
SDKROOT = iphoneos;
947961
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
962+
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
948963
SWIFT_VERSION = 3.0.1;
949964
TARGETED_DEVICE_FAMILY = "1,2";
950965
TVOS_DEPLOYMENT_TARGET = 9.0;
@@ -962,14 +977,20 @@
962977
CLANG_CXX_LIBRARY = "libc++";
963978
CLANG_ENABLE_MODULES = YES;
964979
CLANG_ENABLE_OBJC_ARC = YES;
980+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
965981
CLANG_WARN_BOOL_CONVERSION = YES;
982+
CLANG_WARN_COMMA = YES;
966983
CLANG_WARN_CONSTANT_CONVERSION = YES;
967984
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
968985
CLANG_WARN_EMPTY_BODY = YES;
969986
CLANG_WARN_ENUM_CONVERSION = YES;
970987
CLANG_WARN_INFINITE_RECURSION = YES;
971988
CLANG_WARN_INT_CONVERSION = YES;
989+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
990+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
972991
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
992+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
993+
CLANG_WARN_STRICT_PROTOTYPES = YES;
973994
CLANG_WARN_SUSPICIOUS_MOVE = YES;
974995
CLANG_WARN_UNREACHABLE_CODE = YES;
975996
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -996,6 +1017,7 @@
9961017
PRODUCT_NAME = ReactiveReSwift;
9971018
SDKROOT = iphoneos;
9981019
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
1020+
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
9991021
SWIFT_VERSION = 3.0.1;
10001022
TARGETED_DEVICE_FAMILY = "1,2";
10011023
TVOS_DEPLOYMENT_TARGET = 9.0;

‎ReactiveReSwift.xcodeproj/xcshareddata/xcschemes/ReactiveReSwift-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 = "0810"
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
codeCoverageEnabled = "YES">
3132
<Testables>
@@ -56,6 +57,7 @@
5657
buildConfiguration = "Debug"
5758
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5859
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
60+
language = ""
5961
launchStyle = "0"
6062
useCustomWorkingDirectory = "NO"
6163
ignoresPersistentStateOnLaunch = "NO"

‎ReactiveReSwift.xcodeproj/xcshareddata/xcschemes/ReactiveReSwift-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 = "0810"
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
codeCoverageEnabled = "YES">
3132
<Testables>
@@ -56,6 +57,7 @@
5657
buildConfiguration = "Debug"
5758
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5859
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
60+
language = ""
5961
launchStyle = "0"
6062
useCustomWorkingDirectory = "NO"
6163
ignoresPersistentStateOnLaunch = "NO"

‎ReactiveReSwift.xcodeproj/xcshareddata/xcschemes/ReactiveReSwift-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 = "0810"
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
codeCoverageEnabled = "YES">
3132
<Testables>
@@ -56,6 +57,7 @@
5657
buildConfiguration = "Debug"
5758
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5859
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
60+
language = ""
5961
launchStyle = "0"
6062
useCustomWorkingDirectory = "NO"
6163
ignoresPersistentStateOnLaunch = "NO"

‎ReactiveReSwift.xcodeproj/xcshareddata/xcschemes/ReactiveReSwift-watchOS.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 = "0810"
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
codeCoverageEnabled = "YES">
3132
<Testables>
@@ -37,6 +38,7 @@
3738
buildConfiguration = "Debug"
3839
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
3940
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
41+
language = ""
4042
launchStyle = "0"
4143
useCustomWorkingDirectory = "NO"
4244
ignoresPersistentStateOnLaunch = "NO"

0 commit comments

Comments
 (0)