Skip to content

Commit 74105d9

Browse files
JeehutJeehut
committed
Cleanup and update project
1 parent 4e943a7 commit 74105d9

File tree

15 files changed

+217
-197
lines changed

15 files changed

+217
-197
lines changed

‎CSVImporter.xcodeproj/project.pbxproj

Lines changed: 181 additions & 163 deletions
Large diffs are not rendered by default.

‎CSVImporter.xcodeproj/xcshareddata/xcschemes/CSVImporter OSX.xcscheme

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0910"
3+
LastUpgradeVersion = "0940"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -16,7 +16,7 @@
1616
BuildableIdentifier = "primary"
1717
BlueprintIdentifier = "82239F921C4AFB1000627674"
1818
BuildableName = "CSVImporter.framework"
19-
BlueprintName = "CSVImporter OSX"
19+
BlueprintName = "Framework macOS"
2020
ReferencedContainer = "container:CSVImporter.xcodeproj">
2121
</BuildableReference>
2222
</BuildActionEntry>
@@ -26,16 +26,15 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
language = ""
3029
shouldUseLaunchSchemeArgsEnv = "YES">
3130
<Testables>
3231
<TestableReference
3332
skipped = "NO">
3433
<BuildableReference
3534
BuildableIdentifier = "primary"
3635
BlueprintIdentifier = "82239F9B1C4AFB1000627674"
37-
BuildableName = "CSVImporter OSX Tests.xctest"
38-
BlueprintName = "CSVImporter OSX Tests"
36+
BuildableName = "Tests macOS.xctest"
37+
BlueprintName = "Tests macOS"
3938
ReferencedContainer = "container:CSVImporter.xcodeproj">
4039
</BuildableReference>
4140
</TestableReference>
@@ -45,7 +44,7 @@
4544
BuildableIdentifier = "primary"
4645
BlueprintIdentifier = "82239F921C4AFB1000627674"
4746
BuildableName = "CSVImporter.framework"
48-
BlueprintName = "CSVImporter OSX"
47+
BlueprintName = "Framework macOS"
4948
ReferencedContainer = "container:CSVImporter.xcodeproj">
5049
</BuildableReference>
5150
</MacroExpansion>
@@ -56,7 +55,6 @@
5655
buildConfiguration = "Debug"
5756
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5857
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
59-
language = ""
6058
launchStyle = "0"
6159
useCustomWorkingDirectory = "NO"
6260
ignoresPersistentStateOnLaunch = "NO"
@@ -68,7 +66,7 @@
6866
BuildableIdentifier = "primary"
6967
BlueprintIdentifier = "82239F921C4AFB1000627674"
7068
BuildableName = "CSVImporter.framework"
71-
BlueprintName = "CSVImporter OSX"
69+
BlueprintName = "Framework macOS"
7270
ReferencedContainer = "container:CSVImporter.xcodeproj">
7371
</BuildableReference>
7472
</MacroExpansion>
@@ -86,7 +84,7 @@
8684
BuildableIdentifier = "primary"
8785
BlueprintIdentifier = "82239F921C4AFB1000627674"
8886
BuildableName = "CSVImporter.framework"
89-
BlueprintName = "CSVImporter OSX"
87+
BlueprintName = "Framework macOS"
9088
ReferencedContainer = "container:CSVImporter.xcodeproj">
9189
</BuildableReference>
9290
</MacroExpansion>

‎CSVImporter.xcodeproj/xcshareddata/xcschemes/CSVImporter iOS.xcscheme

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0910"
3+
LastUpgradeVersion = "0940"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -16,7 +16,7 @@
1616
BuildableIdentifier = "primary"
1717
BlueprintIdentifier = "82239F461C4AF70500627674"
1818
BuildableName = "CSVImporter.framework"
19-
BlueprintName = "CSVImporter iOS"
19+
BlueprintName = "Framework iOS"
2020
ReferencedContainer = "container:CSVImporter.xcodeproj">
2121
</BuildableReference>
2222
</BuildActionEntry>
@@ -26,16 +26,15 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
language = ""
3029
shouldUseLaunchSchemeArgsEnv = "YES">
3130
<Testables>
3231
<TestableReference
3332
skipped = "NO">
3433
<BuildableReference
3534
BuildableIdentifier = "primary"
3635
BlueprintIdentifier = "82239F501C4AF70500627674"
37-
BuildableName = "CSVImporter iOS Tests.xctest"
38-
BlueprintName = "CSVImporter iOS Tests"
36+
BuildableName = "Tests iOS.xctest"
37+
BlueprintName = "Tests iOS"
3938
ReferencedContainer = "container:CSVImporter.xcodeproj">
4039
</BuildableReference>
4140
</TestableReference>
@@ -45,7 +44,7 @@
4544
BuildableIdentifier = "primary"
4645
BlueprintIdentifier = "82239F461C4AF70500627674"
4746
BuildableName = "CSVImporter.framework"
48-
BlueprintName = "CSVImporter iOS"
47+
BlueprintName = "Framework iOS"
4948
ReferencedContainer = "container:CSVImporter.xcodeproj">
5049
</BuildableReference>
5150
</MacroExpansion>
@@ -56,7 +55,6 @@
5655
buildConfiguration = "Debug"
5756
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5857
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
59-
language = ""
6058
launchStyle = "0"
6159
useCustomWorkingDirectory = "NO"
6260
ignoresPersistentStateOnLaunch = "NO"
@@ -68,7 +66,7 @@
6866
BuildableIdentifier = "primary"
6967
BlueprintIdentifier = "82239F461C4AF70500627674"
7068
BuildableName = "CSVImporter.framework"
71-
BlueprintName = "CSVImporter iOS"
69+
BlueprintName = "Framework iOS"
7270
ReferencedContainer = "container:CSVImporter.xcodeproj">
7371
</BuildableReference>
7472
</MacroExpansion>
@@ -86,7 +84,7 @@
8684
BuildableIdentifier = "primary"
8785
BlueprintIdentifier = "82239F461C4AF70500627674"
8886
BuildableName = "CSVImporter.framework"
89-
BlueprintName = "CSVImporter iOS"
87+
BlueprintName = "Framework iOS"
9088
ReferencedContainer = "container:CSVImporter.xcodeproj">
9189
</BuildableReference>
9290
</MacroExpansion>

‎CSVImporter.xcodeproj/xcshareddata/xcschemes/CSVImporter tvOS.xcscheme

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0910"
3+
LastUpgradeVersion = "0940"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -16,7 +16,7 @@
1616
BuildableIdentifier = "primary"
1717
BlueprintIdentifier = "82239F761C4AFAFF00627674"
1818
BuildableName = "CSVImporter.framework"
19-
BlueprintName = "CSVImporter tvOS"
19+
BlueprintName = "Framework tvOS"
2020
ReferencedContainer = "container:CSVImporter.xcodeproj">
2121
</BuildableReference>
2222
</BuildActionEntry>
@@ -26,16 +26,15 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
language = ""
3029
shouldUseLaunchSchemeArgsEnv = "YES">
3130
<Testables>
3231
<TestableReference
3332
skipped = "NO">
3433
<BuildableReference
3534
BuildableIdentifier = "primary"
3635
BlueprintIdentifier = "82239F7F1C4AFAFF00627674"
37-
BuildableName = "CSVImporter tvOS Tests.xctest"
38-
BlueprintName = "CSVImporter tvOS Tests"
36+
BuildableName = "Tests tvOS.xctest"
37+
BlueprintName = "Tests tvOS"
3938
ReferencedContainer = "container:CSVImporter.xcodeproj">
4039
</BuildableReference>
4140
</TestableReference>
@@ -45,7 +44,7 @@
4544
BuildableIdentifier = "primary"
4645
BlueprintIdentifier = "82239F761C4AFAFF00627674"
4746
BuildableName = "CSVImporter.framework"
48-
BlueprintName = "CSVImporter tvOS"
47+
BlueprintName = "Framework tvOS"
4948
ReferencedContainer = "container:CSVImporter.xcodeproj">
5049
</BuildableReference>
5150
</MacroExpansion>
@@ -56,7 +55,6 @@
5655
buildConfiguration = "Debug"
5756
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5857
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
59-
language = ""
6058
launchStyle = "0"
6159
useCustomWorkingDirectory = "NO"
6260
ignoresPersistentStateOnLaunch = "NO"
@@ -68,7 +66,7 @@
6866
BuildableIdentifier = "primary"
6967
BlueprintIdentifier = "82239F761C4AFAFF00627674"
7068
BuildableName = "CSVImporter.framework"
71-
BlueprintName = "CSVImporter tvOS"
69+
BlueprintName = "Framework tvOS"
7270
ReferencedContainer = "container:CSVImporter.xcodeproj">
7371
</BuildableReference>
7472
</MacroExpansion>
@@ -86,7 +84,7 @@
8684
BuildableIdentifier = "primary"
8785
BlueprintIdentifier = "82239F761C4AFAFF00627674"
8886
BuildableName = "CSVImporter.framework"
89-
BlueprintName = "CSVImporter tvOS"
87+
BlueprintName = "Framework tvOS"
9088
ReferencedContainer = "container:CSVImporter.xcodeproj">
9189
</BuildableReference>
9290
</MacroExpansion>

‎CSVImporter.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>IDEDidComputeMac32BitWarning</key>
6+
<true/>
7+
</dict>
8+
</plist>

‎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.5.0"
2-
github "Quick/Nimble" "v7.0.3"
3-
github "Quick/Quick" "v1.2.0"
1+
github "Flinesoft/HandySwift" "2.6.0"
2+
github "Quick/Nimble" "v7.1.3"
3+
github "Quick/Quick" "v1.3.0"

‎Sources/Code/CSVImporter.swift renamed to ‎Framework/Sources/CSVImporter.swift

File renamed without changes.

‎Sources/Code/FileSource.swift renamed to ‎Framework/Sources/FileSource.swift

File renamed without changes.

‎Sources/Code/Source.swift renamed to ‎Framework/Sources/Source.swift

File renamed without changes.

‎Sources/Code/StringSource.swift renamed to ‎Framework/Sources/StringSource.swift

File renamed without changes.

‎Sources/Code/TextFile.swift renamed to ‎Framework/Sources/TextFile.swift

File renamed without changes.

‎Sources/Supporting Files/CSVImporter.h renamed to ‎Framework/SupportingFiles/CSVImporter.h

File renamed without changes.

‎Sources/Supporting Files/Info.plist renamed to ‎Framework/SupportingFiles/Info.plist

File renamed without changes.

‎Tests/Supporting Files/Info.plist renamed to ‎Tests/SupportingFiles/Info.plist

File renamed without changes.

‎UsageExamples.playground/Contents.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,11 @@ results
4545
let wrongPathImporter = CSVImporter<[String]>(path: "a/wrong/path")
4646
wrongPathImporter.startImportingRecords { $0 }.onFail {
4747

48-
".onFail called because the path is wrong"
48+
_ = ".onFail called because the path is wrong"
4949

5050
}.onFinish { importedRecords in
5151

52-
".onFinish is never called here because the path is wrong"
52+
_ = ".onFinish is never called here because the path is wrong"
5353

5454
}
5555

@@ -69,7 +69,7 @@ defaultImporter.startImportingRecords { $0 }.onProgress { importedDataLinesCount
6969
let structureImporter = CSVImporter<[String: String]>(path: path)
7070
structureImporter.startImportingRecords(structure: { headerValues in
7171

72-
headerValues // the structural information from the first line as a [String]
72+
_ = headerValues // the structural information from the first line as a [String]
7373

7474
}){ $0 }.onFinish { importedRecords in
7575

@@ -114,7 +114,7 @@ teamsDefaultImporter.startImportingRecords { recordValues -> Team in
114114
let teamsStructuredImporter = CSVImporter<Team>(path: path)
115115
teamsStructuredImporter.startImportingRecords(structure: { headerValues in
116116

117-
headerValues // the structure form the first line of the CSV file
117+
_ = headerValues // the structure form the first line of the CSV file
118118

119119
}) { recordValues -> Team in
120120

0 commit comments

Comments
 (0)