Skip to content

Commit 6c43bcd

Browse files
JeehutJeehut
committed
Update project to Xcode 10.2 & Swift 5 + Update dependencies
1 parent 9e04c56 commit 6c43bcd

File tree

9 files changed

+25
-79
lines changed

9 files changed

+25
-79
lines changed

‎CSVImporter.xcodeproj/project.pbxproj

Lines changed: 7 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -596,7 +596,6 @@
596596
82239F441C4AF70500627674 /* Headers */,
597597
82239F451C4AF70500627674 /* Resources */,
598598
828348681CA6E1F100DC4C26 /* SwiftLint */,
599-
82297C1D215D479E0059FB5B /* ProjLint */,
600599
);
601600
buildRules = (
602601
);
@@ -635,7 +634,6 @@
635634
82239F741C4AFAFF00627674 /* Headers */,
636635
82239F751C4AFAFF00627674 /* Resources */,
637636
828348691CA6E1FD00DC4C26 /* SwiftLint */,
638-
82297C1E215D47B80059FB5B /* ProjLint */,
639637
);
640638
buildRules = (
641639
);
@@ -674,7 +672,6 @@
674672
82239F901C4AFB1000627674 /* Headers */,
675673
82239F911C4AFB1000627674 /* Resources */,
676674
8283486A1CA6E20800DC4C26 /* SwiftLint */,
677-
82297C1F215D47C80059FB5B /* ProjLint */,
678675
);
679676
buildRules = (
680677
);
@@ -711,7 +708,7 @@
711708
isa = PBXProject;
712709
attributes = {
713710
LastSwiftUpdateCheck = 0720;
714-
LastUpgradeCheck = 0940;
711+
LastUpgradeCheck = 1020;
715712
ORGANIZATIONNAME = Flinesoft;
716713
TargetAttributes = {
717714
82239F461C4AF70500627674 = {
@@ -746,10 +743,11 @@
746743
};
747744
buildConfigurationList = 82239F411C4AF70500627674 /* Build configuration list for PBXProject "CSVImporter" */;
748745
compatibilityVersion = "Xcode 3.2";
749-
developmentRegion = English;
746+
developmentRegion = en;
750747
hasScannedForEncodings = 0;
751748
knownRegions = (
752749
en,
750+
Base,
753751
);
754752
mainGroup = 82239F3D1C4AF70500627674;
755753
productRefGroup = 82239F481C4AF70500627674 /* Products */;
@@ -893,60 +891,6 @@
893891
/* End PBXResourcesBuildPhase section */
894892

895893
/* Begin PBXShellScriptBuildPhase section */
896-
82297C1D215D479E0059FB5B /* ProjLint */ = {
897-
isa = PBXShellScriptBuildPhase;
898-
buildActionMask = 2147483647;
899-
files = (
900-
);
901-
inputFileListPaths = (
902-
);
903-
inputPaths = (
904-
);
905-
name = ProjLint;
906-
outputFileListPaths = (
907-
);
908-
outputPaths = (
909-
);
910-
runOnlyForDeploymentPostprocessing = 0;
911-
shellPath = /bin/sh;
912-
shellScript = "if [ \"${CONFIGURATION}\" = \"Debug\" ]; then\n if which projlint > /dev/null; then\n projlint lint --xcode --timeout 2 --ignore-network-errors\n else\n echo \"warning: ProjLint not installed, download it from https://github.com/JamitLabs/ProjLint\"\n fi\nfi\n";
913-
};
914-
82297C1E215D47B80059FB5B /* ProjLint */ = {
915-
isa = PBXShellScriptBuildPhase;
916-
buildActionMask = 2147483647;
917-
files = (
918-
);
919-
inputFileListPaths = (
920-
);
921-
inputPaths = (
922-
);
923-
name = ProjLint;
924-
outputFileListPaths = (
925-
);
926-
outputPaths = (
927-
);
928-
runOnlyForDeploymentPostprocessing = 0;
929-
shellPath = /bin/sh;
930-
shellScript = "if [ \"${CONFIGURATION}\" = \"Debug\" ]; then\n if which projlint > /dev/null; then\n projlint lint --xcode --timeout 2 --ignore-network-errors\n else\n echo \"warning: ProjLint not installed, download it from https://github.com/JamitLabs/ProjLint\"\n fi\nfi\n";
931-
};
932-
82297C1F215D47C80059FB5B /* ProjLint */ = {
933-
isa = PBXShellScriptBuildPhase;
934-
buildActionMask = 2147483647;
935-
files = (
936-
);
937-
inputFileListPaths = (
938-
);
939-
inputPaths = (
940-
);
941-
name = ProjLint;
942-
outputFileListPaths = (
943-
);
944-
outputPaths = (
945-
);
946-
runOnlyForDeploymentPostprocessing = 0;
947-
shellPath = /bin/sh;
948-
shellScript = "if [ \"${CONFIGURATION}\" = \"Debug\" ]; then\n if which projlint > /dev/null; then\n projlint lint --xcode --timeout 2 --ignore-network-errors\n else\n echo \"warning: ProjLint not installed, download it from https://github.com/JamitLabs/ProjLint\"\n fi\nfi\n";
949-
};
950894
828348681CA6E1F100DC4C26 /* SwiftLint */ = {
951895
isa = PBXShellScriptBuildPhase;
952896
buildActionMask = 2147483647;
@@ -1083,6 +1027,7 @@
10831027
isa = XCBuildConfiguration;
10841028
buildSettings = {
10851029
ALWAYS_SEARCH_USER_PATHS = NO;
1030+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
10861031
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
10871032
CLANG_CXX_LIBRARY = "libc++";
10881033
CLANG_ENABLE_MODULES = YES;
@@ -1132,7 +1077,7 @@
11321077
SDKROOT = iphoneos;
11331078
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
11341079
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
1135-
SWIFT_VERSION = 4.2;
1080+
SWIFT_VERSION = 5.0;
11361081
TARGETED_DEVICE_FAMILY = "1,2";
11371082
VERSIONING_SYSTEM = "apple-generic";
11381083
VERSION_INFO_PREFIX = "";
@@ -1143,6 +1088,7 @@
11431088
isa = XCBuildConfiguration;
11441089
buildSettings = {
11451090
ALWAYS_SEARCH_USER_PATHS = NO;
1091+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
11461092
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
11471093
CLANG_CXX_LIBRARY = "libc++";
11481094
CLANG_ENABLE_MODULES = YES;
@@ -1185,7 +1131,7 @@
11851131
SDKROOT = iphoneos;
11861132
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
11871133
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
1188-
SWIFT_VERSION = 4.2;
1134+
SWIFT_VERSION = 5.0;
11891135
TARGETED_DEVICE_FAMILY = "1,2";
11901136
VALIDATE_PRODUCT = YES;
11911137
VERSIONING_SYSTEM = "apple-generic";

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

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

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

‎Cartfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# Handy Swift features that didn't make it into the Swift standard library.
2-
github "Flinesoft/HandySwift" ~> 2.7
2+
github "Flinesoft/HandySwift" ~> 3.0

‎Cartfile.resolved

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
github "Flinesoft/HandySwift" "2.7.0"
2-
github "Quick/Nimble" "v7.3.1"
3-
github "Quick/Quick" "v1.3.2"
1+
github "Flinesoft/HandySwift" "3.0.0"
2+
github "Quick/Nimble" "v8.0.1"
3+
github "Quick/Quick" "v2.1.0"

‎Package.resolved

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,26 +6,26 @@
66
"repositoryURL": "https://github.com/Flinesoft/HandySwift.git",
77
"state": {
88
"branch": null,
9-
"revision": "dfa0f27ac41b8f1129581a62d1d65c355cb0b3a3",
10-
"version": "2.7.0"
9+
"revision": "4225d7654f87886b09dddf52761fc898e4bfd137",
10+
"version": "3.0.0"
1111
}
1212
},
1313
{
1414
"package": "Nimble",
1515
"repositoryURL": "https://github.com/Quick/Nimble.git",
1616
"state": {
1717
"branch": null,
18-
"revision": "cd6dfb86f496fcd96ce0bc6da962cd936bf41903",
19-
"version": "7.3.1"
18+
"revision": "43304bf2b1579fd555f2fdd51742771c1e4f2b98",
19+
"version": "8.0.1"
2020
}
2121
},
2222
{
2323
"package": "Quick",
2424
"repositoryURL": "https://github.com/Quick/Quick.git",
2525
"state": {
2626
"branch": null,
27-
"revision": "5fbf13871d185526993130c3a1fad0b70bfe37ce",
28-
"version": "1.3.2"
27+
"revision": "94df9b449508344667e5afc7e80f8bcbff1e4c37",
28+
"version": "2.1.0"
2929
}
3030
}
3131
]

‎Package.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ let package = Package(
77
.library(name: "CSVImporter", targets: ["CSVImporter"])
88
],
99
dependencies: [
10-
.package(url: "https://github.com/Flinesoft/HandySwift.git", .upToNextMajor(from: "2.7.0")),
11-
.package(url: "https://github.com/Quick/Quick.git", .upToNextMajor(from: "1.3.2")),
12-
.package(url: "https://github.com/Quick/Nimble.git", .upToNextMajor(from: "7.3.1"))
10+
.package(url: "https://github.com/Flinesoft/HandySwift.git", .upToNextMajor(from: "3.0.0")),
11+
.package(url: "https://github.com/Quick/Quick.git", .upToNextMajor(from: "2.1.0")),
12+
.package(url: "https://github.com/Quick/Nimble.git", .upToNextMajor(from: "8.0.1")),
1313
],
1414
targets: [
1515
.target(

‎Tests/CSVImporterTests/CSVImporterSpec.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ class CSVImporterSpec: QuickSpec { // swiftlint:disable:this type_body_length
257257
if let path = path {
258258
do {
259259
let string = try String(contentsOfFile: path)
260-
expect(string.contains(LineEnding.carriageReturnLineFeed.rawValue)).to(beTrue())
260+
expect(string).to(contain(LineEnding.carriageReturnLineFeed.rawValue))
261261
} catch { }
262262

263263
let importer = CSVImporter<[String: String]>(path: path, lineEnding: .newLine) // wrong
@@ -427,7 +427,7 @@ class CSVImporterSpec: QuickSpec { // swiftlint:disable:this type_body_length
427427
if let path = pathForResourceFile("Teams.csv") {
428428
do {
429429
let string = try String(contentsOfFile: path)
430-
expect(string.contains(LineEnding.carriageReturnLineFeed.rawValue)).to(beTrue())
430+
expect(string).to(contain(LineEnding.carriageReturnLineFeed.rawValue))
431431
let crString = string.replacingOccurrences(of: LineEnding.carriageReturnLineFeed.rawValue, with: lineEnding.rawValue)
432432
let tempPath = (NSTemporaryDirectory() as NSString).appendingPathComponent("TeamsNewLineEnding.csv")
433433
try crString.write(toFile: tempPath, atomically: false, encoding: .utf8)

0 commit comments

Comments
 (0)