From ad2042d0ba2ea260246b0e1b1d5710cbc53e2836 Mon Sep 17 00:00:00 2001 From: Christian Tietze Date: Mon, 30 Nov 2020 20:24:41 +0100 Subject: [PATCH] Release 0.6.0 (#94) * add contributors to license * add running log of changes for release notes * note Swift 5.3 compatibiltiy in readme * bump version --- CHANGELOG.md | 20 ++++++++++++++++++++ LICENSE | 4 ++-- README.md | 40 ++++++++++++++++++++-------------------- SwiftCSV.podspec | 4 ++-- 4 files changed, 44 insertions(+), 24 deletions(-) create mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..0a43b8b --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,20 @@ + + + +## 0.6.0 + +API Changes: + +- Rename `View` to `CSVView` to avoid SwiftUI namespace conflicts (#93) - @campionfellin + +Other: + +- Bump iOS Deployment target to 9.0, Xcode 12 recommended changes. (#91) - @DenTelezhkin diff --git a/LICENSE b/LICENSE index 9a95997..49229d6 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,7 @@ The MIT License (MIT) -Copyright (c) 2014 Naoto Kaneko +Copyright (c) 2014 Naoto Kaneko. +Copyright (c) 2019 SwiftCSV Contributors. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -19,4 +20,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - diff --git a/README.md b/README.md index 7c2f41a..ad9635b 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ # SwiftCSV -![Swift 5.0](https://img.shields.io/badge/Swift-5.0-blue.svg?style=flat) -[![Platform support](https://img.shields.io/badge/platform-ios%20%7C%20osx%20%7C%20tvos%20%7C%20watchos-lightgrey.svg?style=flat-square)](https://github.com/swiftcsv/SwiftCSV/blob/master/LICENSE.md) -[![Build Status](https://img.shields.io/travis/swiftcsv/SwiftCSV/master.svg?style=flat-square)](https://travis-ci.org/swiftcsv/SwiftCSV) +![Swift 5.3](https://img.shields.io/badge/Swift-5.3-blue.svg?style=flat) +[![Platform support](https://img.shields.io/badge/platform-ios%20%7C%20osx%20%7C%20tvos%20%7C%20watchos-lightgrey.svg?style=flat-square)](https://github.com/swiftcsv/SwiftCSV/blob/master/LICENSE.md) +[![Build Status](https://img.shields.io/travis/swiftcsv/SwiftCSV/master.svg?style=flat-square)](https://travis-ci.org/swiftcsv/SwiftCSV) [![Code coverage status](https://codecov.io/gh/swiftcsv/SwiftCSV/branch/master/graph/badge.svg)](https://codecov.io/gh/swiftcsv/SwiftCSV) -[![CocoaPods Compatible](https://img.shields.io/cocoapods/v/SwiftCSV.svg?style=flat-square)](https://cocoapods.org/pods/SwiftCSV) +[![CocoaPods Compatible](https://img.shields.io/cocoapods/v/SwiftCSV.svg?style=flat-square)](https://cocoapods.org/pods/SwiftCSV) [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage) -[![License MIT](https://img.shields.io/badge/license-MIT-blue.svg?style=flat-square)](https://github.com/swiftcsv/SwiftCSV/blob/master/LICENSE.md) +[![License MIT](https://img.shields.io/badge/license-MIT-blue.svg?style=flat-square)](https://github.com/swiftcsv/SwiftCSV/blob/master/LICENSE.md) [![Reviewed by Hound](https://img.shields.io/badge/Reviewed_by-Hound-8E64B0.svg?style=flat-square)](https://houndci.com) @@ -31,10 +31,10 @@ do { // From a file inside the app bundle, with a custom delimiter, errors, and custom encoding let resource: CSV? = try CSV( - name: "users", - extension: "tsv", - bundle: .main, - delimiter: "\t", + name: "users", + extension: "tsv", + bundle: .main, + delimiter: "\t", encoding: .utf8) } catch parseError as CSVParseError { // Catch errors from parsing invalid formed CSV @@ -55,10 +55,10 @@ class CSV { /// - parameter delimiter: Character used to separate row and header fields (default is ',') /// - parameter loadColumns: Whether to populate the `columns` dictionary (default is `true`) /// - throws: `CSVParseError` when parsing `string` fails. - public init(string: String, - delimiter: Character = comma, + public init(string: String, + delimiter: Character = comma, loadColumns: Bool = true) throws - + /// Load a CSV file as a named resource from `bundle`. /// /// - parameter name: Name of the file resource inside `bundle`. @@ -70,11 +70,11 @@ class CSV { /// - throws: `CSVParseError` when parsing the contents of the resource fails, or file loading errors. /// - returns: `nil` if the resource could not be found public convenience init?( - name: String, - extension ext: String? = nil, - bundle: Bundle = .main, - delimiter: Character = comma, - encoding: String.Encoding = .utf8, + name: String, + extension ext: String? = nil, + bundle: Bundle = .main, + delimiter: Character = comma, + encoding: String.Encoding = .utf8, loadColumns: Bool = true) throws /// Load a CSV file from `url`. @@ -85,9 +85,9 @@ class CSV { /// - parameter loadColumns: Whether to populate the columns dictionary (default is `true`) /// - throws: `CSVParseError` when parsing the contents of `url` fails, or file loading errors. public convenience init( - url: URL, - delimiter: Character = comma, - encoding: String.Encoding = .utf8, + url: URL, + delimiter: Character = comma, + encoding: String.Encoding = .utf8, loadColumns: Bool = true) } diff --git a/SwiftCSV.podspec b/SwiftCSV.podspec index d6fa91b..9d24f90 100644 --- a/SwiftCSV.podspec +++ b/SwiftCSV.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "SwiftCSV" - s.version = "0.5.6" + s.version = "0.6.0" s.summary = "CSV parser for Swift" s.homepage = "https://github.com/swiftcsv/SwiftCSV" s.license = { :type => "MIT", :file => "LICENSE" } @@ -9,7 +9,7 @@ Pod::Spec.new do |s| "Christian Tietze" => "me@christiantietze.de" } s.source = { :git => "https://github.com/swiftcsv/SwiftCSV.git", :tag => s.version } - s.swift_versions = [ "5.0", "4.2" ] + s.swift_versions = [ "5.3", "5.2", "5.1", "5.0", "4.2" ] s.ios.deployment_target = "9.0" s.osx.deployment_target = "10.9"