Merge branch 'deploy/1.3.1' into productive

Author: Jeehut

.swift-version

@@ -0,0 +1 @@
+3.0.1

.swiftlint.yml

@@ -1,16 +1,15 @@
-# some rules are only opt-in
 opt_in_rules:
 - empty_count
-- missing_docs
+# - missing_docs
+
+disabled_rules:
+- vertical_whitespace # Turn off until configurable to 2 newlines
 
-# paths to include during linting. `--path` is ignored if present.
 included:
 - Sources
 
-# paths to ignore during linting. Takes precedence over `included`.
 excluded:
 - Carthage
 - Sources/Constants
 
-# configurable rules can be customized from this configuration file
-line_length: 200
+line_length: 200

CSVImporter.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "CSVImporter"
-  s.version      = "1.2.0"
+  s.version      = "1.3.1"
   s.summary      = "Import CSV files line by line with ease."
 
   s.description  = <<-DESC
@@ -24,7 +24,7 @@ Pod::Spec.new do |s|
   s.source       = { :git => "https://github.com/Flinesoft/CSVImporter.git", :tag => "#{s.version}" }
   s.source_files  = "Sources", "Sources/**/*.swift"
   s.framework  = "Foundation"
-  s.dependency "HandySwift", "~> 1.2"
-  s.dependency "Dschee-FileKit", "~> 3.0"
+  s.dependency "HandySwift", "~> 1.3"
+  s.dependency "FileKit", "~> 4.0"
 
 end

Cartfile.resolved

@@ -1,4 +1,4 @@
 github "nvzqz/FileKit" "29e8c684fdb3018b3fe8ca6b84fe4fb06ef891bf"
 github "Flinesoft/HandySwift" "1.3.0"
-github "Quick/Nimble" "8b71ca345b9b41e3555f87dd904c6f23e4ccdc34"
-github "Quick/Quick" "505af8e6f9c85a2e243b36986ee2cf926cda5a7e"
+github "Quick/Nimble" "76c4cb3567f3492c00e84a1000ba8622355c8323"
+github "Quick/Quick" "8e794df56011c6282f1074e8fd5c113d5f013e63"

README.md

@@ -12,13 +12,13 @@
              alt="codebeat badge">
     </a>
     <a href="https://github.com/Flinesoft/CSVImporter/releases">
-        <img src="https://img.shields.io/badge/Version-1.2.0-blue.svg"
-             alt="Version: 1.2.0">
+        <img src="https://img.shields.io/badge/Version-1.3.1-blue.svg"
+             alt="Version: 1.3.1">
     </a>
-    <img src="https://img.shields.io/badge/Swift-2.2-FFAC45.svg"
-         alt="Swift: 2.2">
-    <img src="https://img.shields.io/badge/Platforms-iOS%20%7C%20tvOS%20%7C%20OS%20X-FF69B4.svg"
-        alt="Platforms: iOS | tvOS | OS X">
+    <img src="https://img.shields.io/badge/Swift-3-FFAC45.svg"
+         alt="Swift: 3">
+    <img src="https://img.shields.io/badge/Platforms-iOS%20%7C%20tvOS%20%7C%20macOS-FF69B4.svg"
+        alt="Platforms: iOS | tvOS | macOS">
     <a href="https://github.com/Flinesoft/CSVImporter/blob/stable/LICENSE.md">
         <img src="https://img.shields.io/badge/License-MIT-lightgrey.svg"
               alt="License: MIT">
@@ -56,7 +56,7 @@ You can of course also just include this framework manually into your project by
 Simply add this line to your Cartfile:
 
 ```
-github "Flinesoft/CSVImporter"
+github "Flinesoft/CSVImporter" ~> 1.3
 ```
 
 And run `carthage update`. Then drag & drop the HandySwift.framework in the Carthage/build folder to your project. Also do the same with the dependent frameworks `Filekit` and `HandySwift`. Now you can `import CSVImporter` in each class you want to use its features. Refer to the [Carthage README](https://github.com/Carthage/Carthage#adding-frameworks-to-an-application) for detailed / updated instructions.
@@ -71,7 +71,7 @@ platform :ios, '8.0'
 use_frameworks!
 
 target 'MyAppTarget' do
-    pod 'CSVImporter', '~> 1.1'
+    pod 'CSVImporter', '~> 1.3'
 end
 ```
 

Sources/Supporting Files/Info.plist

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