Skip to content

Commit b847daa

Browse files
dehesadehesa
committed
Update to Swift 5
1 parent 7101587 commit b847daa

File tree

16 files changed

+78
-35
lines changed

16 files changed

+78
-35
lines changed

‎CodableCSV.xcodeproj/project.pbxproj‎

Lines changed: 58 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -905,7 +905,7 @@
905905
isa = PBXProject;
906906
attributes = {
907907
LastSwiftUpdateCheck = 1000;
908-
LastUpgradeCheck = 1000;
908+
LastUpgradeCheck = 1020;
909909
TargetAttributes = {
910910
8D1806D021245DC5009EB7BF = {
911911
CreatedOnToolsVersion = 10.0;
@@ -940,6 +940,7 @@
940940
hasScannedForEncodings = 0;
941941
knownRegions = (
942942
en,
943+
Base,
943944
);
944945
mainGroup = 8DA1392621245C0C0082309E;
945946
productRefGroup = 8D1806D221245DC5009EB7BF /* Products */;
@@ -1393,7 +1394,6 @@
13931394
SKIP_INSTALL = YES;
13941395
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
13951396
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1396-
SWIFT_VERSION = 4.2;
13971397
VERSIONING_SYSTEM = "apple-generic";
13981398
};
13991399
name = Debug;
@@ -1460,7 +1460,6 @@
14601460
SKIP_INSTALL = YES;
14611461
SWIFT_COMPILATION_MODE = wholemodule;
14621462
SWIFT_OPTIMIZATION_LEVEL = "-O";
1463-
SWIFT_VERSION = 4.2;
14641463
VERSIONING_SYSTEM = "apple-generic";
14651464
};
14661465
name = Release;
@@ -1530,7 +1529,6 @@
15301529
ONLY_ACTIVE_ARCH = YES;
15311530
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
15321531
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1533-
SWIFT_VERSION = 4.2;
15341532
};
15351533
name = Debug;
15361534
};
@@ -1592,7 +1590,6 @@
15921590
MTL_FAST_MATH = YES;
15931591
SWIFT_COMPILATION_MODE = wholemodule;
15941592
SWIFT_OPTIMIZATION_LEVEL = "-O";
1595-
SWIFT_VERSION = 4.2;
15961593
};
15971594
name = Release;
15981595
};
@@ -1629,7 +1626,7 @@
16291626
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
16301627
CLANG_WARN_UNREACHABLE_CODE = YES;
16311628
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
1632-
CODE_SIGN_IDENTITY = "iPhone Developer";
1629+
CODE_SIGN_IDENTITY = "";
16331630
CODE_SIGN_STYLE = Automatic;
16341631
COPY_PHASE_STRIP = NO;
16351632
DEBUG_INFORMATION_FORMAT = dwarf;
@@ -1663,7 +1660,6 @@
16631660
SKIP_INSTALL = YES;
16641661
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
16651662
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1666-
SWIFT_VERSION = 4.2;
16671663
TARGETED_DEVICE_FAMILY = "1,2";
16681664
VERSIONING_SYSTEM = "apple-generic";
16691665
};
@@ -1702,7 +1698,7 @@
17021698
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
17031699
CLANG_WARN_UNREACHABLE_CODE = YES;
17041700
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
1705-
CODE_SIGN_IDENTITY = "iPhone Developer";
1701+
CODE_SIGN_IDENTITY = "";
17061702
CODE_SIGN_STYLE = Automatic;
17071703
COPY_PHASE_STRIP = NO;
17081704
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
@@ -1729,7 +1725,6 @@
17291725
SKIP_INSTALL = YES;
17301726
SWIFT_COMPILATION_MODE = wholemodule;
17311727
SWIFT_OPTIMIZATION_LEVEL = "-O";
1732-
SWIFT_VERSION = 4.2;
17331728
TARGETED_DEVICE_FAMILY = "1,2";
17341729
VALIDATE_PRODUCT = YES;
17351730
VERSIONING_SYSTEM = "apple-generic";
@@ -1800,7 +1795,6 @@
18001795
ONLY_ACTIVE_ARCH = YES;
18011796
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
18021797
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1803-
SWIFT_VERSION = 4.2;
18041798
TARGETED_DEVICE_FAMILY = "1,2";
18051799
};
18061800
name = Debug;
@@ -1862,7 +1856,6 @@
18621856
MTL_FAST_MATH = YES;
18631857
SWIFT_COMPILATION_MODE = wholemodule;
18641858
SWIFT_OPTIMIZATION_LEVEL = "-O";
1865-
SWIFT_VERSION = 4.2;
18661859
TARGETED_DEVICE_FAMILY = "1,2";
18671860
VALIDATE_PRODUCT = YES;
18681861
};
@@ -1901,6 +1894,7 @@
19011894
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
19021895
CLANG_WARN_UNREACHABLE_CODE = YES;
19031896
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
1897+
CODE_SIGN_IDENTITY = "";
19041898
CODE_SIGN_STYLE = Automatic;
19051899
COPY_PHASE_STRIP = NO;
19061900
DEBUG_INFORMATION_FORMAT = dwarf;
@@ -1935,7 +1929,6 @@
19351929
SKIP_INSTALL = YES;
19361930
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
19371931
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1938-
SWIFT_VERSION = 4.2;
19391932
TARGETED_DEVICE_FAMILY = 3;
19401933
VERSIONING_SYSTEM = "apple-generic";
19411934
};
@@ -1974,6 +1967,7 @@
19741967
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
19751968
CLANG_WARN_UNREACHABLE_CODE = YES;
19761969
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
1970+
CODE_SIGN_IDENTITY = "";
19771971
CODE_SIGN_STYLE = Automatic;
19781972
COPY_PHASE_STRIP = NO;
19791973
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
@@ -2001,7 +1995,6 @@
20011995
SKIP_INSTALL = YES;
20021996
SWIFT_COMPILATION_MODE = wholemodule;
20031997
SWIFT_OPTIMIZATION_LEVEL = "-O";
2004-
SWIFT_VERSION = 4.2;
20051998
TARGETED_DEVICE_FAMILY = 3;
20061999
VALIDATE_PRODUCT = YES;
20072000
VERSIONING_SYSTEM = "apple-generic";
@@ -2071,7 +2064,6 @@
20712064
ONLY_ACTIVE_ARCH = YES;
20722065
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
20732066
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
2074-
SWIFT_VERSION = 4.2;
20752067
TARGETED_DEVICE_FAMILY = 3;
20762068
};
20772069
name = Debug;
@@ -2132,7 +2124,6 @@
21322124
MTL_FAST_MATH = YES;
21332125
SWIFT_COMPILATION_MODE = wholemodule;
21342126
SWIFT_OPTIMIZATION_LEVEL = "-O";
2135-
SWIFT_VERSION = 4.2;
21362127
TARGETED_DEVICE_FAMILY = 3;
21372128
VALIDATE_PRODUCT = YES;
21382129
};
@@ -2206,7 +2197,6 @@
22062197
SKIP_INSTALL = YES;
22072198
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
22082199
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
2209-
SWIFT_VERSION = 4.2;
22102200
TARGETED_DEVICE_FAMILY = 4;
22112201
VERSIONING_SYSTEM = "apple-generic";
22122202
};
@@ -2273,7 +2263,6 @@
22732263
SKIP_INSTALL = YES;
22742264
SWIFT_COMPILATION_MODE = wholemodule;
22752265
SWIFT_OPTIMIZATION_LEVEL = "-O";
2276-
SWIFT_VERSION = 4.2;
22772266
TARGETED_DEVICE_FAMILY = 4;
22782267
VALIDATE_PRODUCT = YES;
22792268
VERSIONING_SYSTEM = "apple-generic";
@@ -2284,13 +2273,65 @@
22842273
isa = XCBuildConfiguration;
22852274
baseConfigurationReference = 8D1806CB21245D04009EB7BF /* Common.xcconfig */;
22862275
buildSettings = {
2276+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
2277+
CLANG_WARN_BOOL_CONVERSION = YES;
2278+
CLANG_WARN_COMMA = YES;
2279+
CLANG_WARN_CONSTANT_CONVERSION = YES;
2280+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
2281+
CLANG_WARN_EMPTY_BODY = YES;
2282+
CLANG_WARN_ENUM_CONVERSION = YES;
2283+
CLANG_WARN_INFINITE_RECURSION = YES;
2284+
CLANG_WARN_INT_CONVERSION = YES;
2285+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
2286+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
2287+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
2288+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
2289+
CLANG_WARN_STRICT_PROTOTYPES = YES;
2290+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
2291+
CLANG_WARN_UNREACHABLE_CODE = YES;
2292+
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
2293+
ENABLE_STRICT_OBJC_MSGSEND = YES;
2294+
ENABLE_TESTABILITY = YES;
2295+
GCC_NO_COMMON_BLOCKS = YES;
2296+
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
2297+
GCC_WARN_ABOUT_RETURN_TYPE = YES;
2298+
GCC_WARN_UNDECLARED_SELECTOR = YES;
2299+
GCC_WARN_UNINITIALIZED_AUTOS = YES;
2300+
GCC_WARN_UNUSED_FUNCTION = YES;
2301+
GCC_WARN_UNUSED_VARIABLE = YES;
2302+
ONLY_ACTIVE_ARCH = YES;
22872303
};
22882304
name = Debug;
22892305
};
22902306
8DA1392C21245C0C0082309E /* Release */ = {
22912307
isa = XCBuildConfiguration;
22922308
baseConfigurationReference = 8D1806CB21245D04009EB7BF /* Common.xcconfig */;
22932309
buildSettings = {
2310+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
2311+
CLANG_WARN_BOOL_CONVERSION = YES;
2312+
CLANG_WARN_COMMA = YES;
2313+
CLANG_WARN_CONSTANT_CONVERSION = YES;
2314+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
2315+
CLANG_WARN_EMPTY_BODY = YES;
2316+
CLANG_WARN_ENUM_CONVERSION = YES;
2317+
CLANG_WARN_INFINITE_RECURSION = YES;
2318+
CLANG_WARN_INT_CONVERSION = YES;
2319+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
2320+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
2321+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
2322+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
2323+
CLANG_WARN_STRICT_PROTOTYPES = YES;
2324+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
2325+
CLANG_WARN_UNREACHABLE_CODE = YES;
2326+
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
2327+
ENABLE_STRICT_OBJC_MSGSEND = YES;
2328+
GCC_NO_COMMON_BLOCKS = YES;
2329+
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
2330+
GCC_WARN_ABOUT_RETURN_TYPE = YES;
2331+
GCC_WARN_UNDECLARED_SELECTOR = YES;
2332+
GCC_WARN_UNINITIALIZED_AUTOS = YES;
2333+
GCC_WARN_UNUSED_FUNCTION = YES;
2334+
GCC_WARN_UNUSED_VARIABLE = YES;
22942335
};
22952336
name = Release;
22962337
};

‎CodableCSV.xcodeproj/xcshareddata/xcschemes/CSV [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 = "1000"
3+
LastUpgradeVersion = "1020"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎CodableCSV.xcodeproj/xcshareddata/xcschemes/CSV [macOS].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 = "1000"
3+
LastUpgradeVersion = "1020"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎CodableCSV.xcodeproj/xcshareddata/xcschemes/CSV [tvOS].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 = "1000"
3+
LastUpgradeVersion = "1020"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎CodableCSV.xcodeproj/xcshareddata/xcschemes/CSV [watchOS].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 = "1000"
3+
LastUpgradeVersion = "1020"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Configuration/Common/Common.xcconfig‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ INFOPLIST_FILE = $(SRCROOT)/Configuration/Common/Common.plist
55

66
// Versioning
77
CURRENT_PROJECT_VERSION = 1
8-
DYLIB_CURRENT_VERSION = 0.2.0
8+
DYLIB_CURRENT_VERSION = 0.2.1
99
DYLIB_COMPATIBILITY_VERSION = $(DYLIB_CURRENT_VERSION)
1010

1111
// Swift
12-
SWIFT_VERSION = 4.2
12+
SWIFT_VERSION = 5
1313

1414
// User-Generated
1515
BUNDLE_SIGNATURE = MSDC

‎Configuration/iOS/iOS.xcconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
SDKROOT = iphoneos
33

44
// Deployment
5-
IPHONEOS_DEPLOYMENT_TARGET = 11.1
5+
IPHONEOS_DEPLOYMENT_TARGET = 12.2
66

77
// Packaging
88
PRODUCT_BUNDLE_IDENTIFIER = $(PRODUCT_BUNDLE_IDENTIFIER).ios

‎Configuration/iOS/iOS_tests.xcconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
SDKROOT = iphoneos
33

44
// Deployment
5-
IPHONEOS_DEPLOYMENT_TARGET = 11.1
5+
IPHONEOS_DEPLOYMENT_TARGET = 12.2
66

77
// Packaging
88
PRODUCT_NAME = $(PRODUCT_NAME)Tests

‎Configuration/macOS/macOS.xcconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
SDKROOT = macosx
33

44
// Deployment
5-
MACOSX_DEPLOYMENT_TARGET = 10.13
5+
MACOSX_DEPLOYMENT_TARGET = 10.14
66

77
// Packaging
88
PRODUCT_BUNDLE_IDENTIFIER = $(PRODUCT_BUNDLE_IDENTIFIER).macos

‎Configuration/macOS/macOS_tests.xcconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
SDKROOT = macosx
33

44
// Deployment
5-
MACOSX_DEPLOYMENT_TARGET = 10.13
5+
MACOSX_DEPLOYMENT_TARGET = 10.14
66

77
// Packaging
88
PRODUCT_NAME = $(PRODUCT_NAME)Tests

0 commit comments

Comments
 (0)