dnrops
/
CSV.swift
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #38 from yaslab/swift4 

Support for Swift 4
This commit is contained in:
Yasuhiro Hatta 2017-09-23 18:30:15 +09:00 committed by GitHub
parent a3e770943d 6cf6ab0ae9
commit 17b079f2d5
14 changed files with 47 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.swift-version
View File

@ -1 +1 @@
3.1
3.2

2
.travis.yml
View File

@ -1,5 +1,5 @@
language: swift
osx_image: xcode8.3
osx_image: xcode9
script:
- set -o pipefail && xcodebuild test -scheme CSV-macOS
after_success:

2
CSV.swift.podspec
View File

@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'CSV.swift'
s.version = '2.0.1'
s.version = '2.1.0'
s.license = 'MIT'
s.summary = 'CSV reading and writing library written in Swift.'
s.homepage = 'https://github.com/yaslab/CSV.swift'

18
CSV.xcodeproj/project.pbxproj
View File

@ -407,7 +407,7 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0730;
LastUpgradeCheck = 0810;
LastUpgradeCheck = 0900;
ORGANIZATIONNAME = yaslab;
TargetAttributes = {
0E7E8C801D0BC7BB0057A1C1 = {
@ -424,11 +424,11 @@
};
0E7E8CC51D0BCA2A0057A1C1 = {
CreatedOnToolsVersion = 7.3.1;
LastSwiftMigration = 0800;
LastSwiftMigration = 0900;
};
0E7E8CCE1D0BCA2A0057A1C1 = {
CreatedOnToolsVersion = 7.3.1;
LastSwiftMigration = 0800;
LastSwiftMigration = 0900;
};
0E7E8CE71D0BCD0B0057A1C1 = {
CreatedOnToolsVersion = 7.3.1;
@ -661,14 +661,20 @@
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@ -713,14 +719,20 @@
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;

4
CSV.xcodeproj/xcshareddata/xcschemes/CSV-iOS.xcscheme
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0810"
LastUpgradeVersion = "0900"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
@ -26,6 +26,7 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
@ -55,6 +56,7 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"

4
CSV.xcodeproj/xcshareddata/xcschemes/CSV-macOS.xcscheme
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0810"
LastUpgradeVersion = "0900"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
@ -26,6 +26,7 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
shouldUseLaunchSchemeArgsEnv = "YES"
codeCoverageEnabled = "YES">
<Testables>
@ -56,6 +57,7 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"

4
CSV.xcodeproj/xcshareddata/xcschemes/CSV-tvOS.xcscheme
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0810"
LastUpgradeVersion = "0900"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
@ -26,6 +26,7 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
@ -55,6 +56,7 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"

4
CSV.xcodeproj/xcshareddata/xcschemes/CSV-watchOS.xcscheme
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0810"
LastUpgradeVersion = "0900"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
@ -26,6 +26,7 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
@ -36,6 +37,7 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"

3
Package.swift
View File

@ -2,6 +2,5 @@ import PackageDescription
let package = Package(
name: "CSV",
targets: [],
dependencies: []
swiftLanguageVersions: [3, 4]
)

6
README.md
View File

@ -140,13 +140,13 @@ csv.stream.close()
### CocoaPods
```ruby
pod 'CSV.swift', '~> 2.0'
pod 'CSV.swift', '~> 2.1'
```
### Carthage
```
github "yaslab/CSV.swift" ~> 2.0
github "yaslab/CSV.swift" ~> 2.1
```
### Swift Package Manager
@ -157,7 +157,7 @@ import PackageDescription
let package = Package(
name: "PackageName",
dependencies: [
.Package(url: "https://github.com/yaslab/CSV.swift.git", majorVersion: 2, minor: 0)
.Package(url: "https://github.com/yaslab/CSV.swift.git", majorVersion: 2, minor: 1)
]
)
```

10
Sources/CSVReader.swift
View File

@ -15,11 +15,6 @@ internal let DQUOTE: UnicodeScalar = "\""
internal let DQUOTE_STR: String = "\""
internal let DQUOTE2_STR: String = "\"\""
public let defaultHasHeaderRow = false
public let defaultTrimFields = false
public let defaultDelimiter: UnicodeScalar = ","
public let defaultWhitespaces = CharacterSet.whitespaces
/// No overview available.
public class CSVReader {
@ -89,6 +84,11 @@ public class CSVReader {
extension CSVReader {
public static let defaultHasHeaderRow: Bool = false
public static let defaultTrimFields: Bool = false
public static let defaultDelimiter: UnicodeScalar = ","
public static let defaultWhitespaces: CharacterSet = .whitespaces
/// Create an instance with `InputStream`.
///
/// - parameter stream: An `InputStream` object. If the stream is not open,

2
Sources/CSVWriter.swift
View File

@ -69,6 +69,8 @@ public class CSVWriter {
extension CSVWriter {
public static let defaultDelimiter: UnicodeScalar = ","
public convenience init(
stream: OutputStream,
delimiter: String = String(defaultDelimiter),

2
Sources/Info.plist
View File

@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>2.0.1</string>
<string>2.1.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>

10
Tests/CSVTests/Version1Tests.swift
View File

@ -28,7 +28,7 @@ class Version1Tests: XCTestCase {
do {
let stream = InputStream(data: data8)
var csv = try CSV(stream: stream,
let csv = try CSV(stream: stream,
codecType: UTF8.self,
hasHeaderRow: true,
trimFields: false,
@ -42,7 +42,7 @@ class Version1Tests: XCTestCase {
do {
let stream = InputStream(data: data16)
var csv = try CSV(stream: stream,
let csv = try CSV(stream: stream,
codecType: UTF16.self,
endian: .big,
hasHeaderRow: true,
@ -57,7 +57,7 @@ class Version1Tests: XCTestCase {
do {
let stream = InputStream(data: data32)
var csv = try CSV(stream: stream,
let csv = try CSV(stream: stream,
codecType: UTF32.self,
endian: .big,
hasHeaderRow: true,
@ -72,7 +72,7 @@ class Version1Tests: XCTestCase {
do {
let stream = InputStream(data: data8)
var csv = try CSV(stream: stream,
let csv = try CSV(stream: stream,
hasHeaderRow: true,
trimFields: false,
delimiter: ",")
@ -84,7 +84,7 @@ class Version1Tests: XCTestCase {
}
do {
var csv = try CSV(string: str,
let csv = try CSV(string: str,
hasHeaderRow: true,
trimFields: false,
delimiter: ",")