Merge branch 'release-2.0.3'

.travis.yml

@@ -1,8 +1,8 @@
 language: objective-c
-osx_image: xcode9.2
+osx_image: xcode9.3
 xcode_project: GSLCSVSerialization.xcodeproj
 xcode_scheme: GSLCSVSerialization
-xcode_sdk: iphonesimulator11.2
+xcode_sdk: iphonesimulator11.3
 before_install:
 - gem install xcpretty
 script:

GSLCSVSerialization.podspec

@@ -1,11 +1,11 @@
 Pod::Spec.new do |s|
   s.name         = 'GSLCSVSerialization'
-  s.version      = '2.0.2'
+  s.version      = '2.0.3'
   s.author       = 'GyazSquare'
   s.license      = { :type => 'MIT' }
   s.homepage     = 'https://github.com/GyazSquare/GSLCSVSerialization'
-  s.source       = { :git => 'https://github.com/GyazSquare/GSLCSVSerialization.git', :tag => 'v2.0.2' }
-  s.summary      = 'An Objective-C CSV parser for iOS, OS X, watchOS and tvOS.'
+  s.source       = { :git => 'https://github.com/GyazSquare/GSLCSVSerialization.git', :tag => 'v2.0.3' }
+  s.summary      = 'An Objective-C CSV parser for iOS, macOS, watchOS and tvOS.'
   s.ios.deployment_target = '8.0'
   s.osx.deployment_target = '10.6'
   s.tvos.deployment_target = '9.0'

GSLCSVSerialization.xcodeproj/project.pbxproj

@@ -155,7 +155,7 @@
 		D7B2F4951B0442F000C877F6 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0900;
+				LastUpgradeCheck = 0930;
 				TargetAttributes = {
 					D7B2F49C1B0442F000C877F6 = {
 						CreatedOnToolsVersion = 6.3.2;
@@ -234,12 +234,14 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = 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_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -285,12 +287,14 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = 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_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;

GSLCSVSerialization.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

GSLCSVSerialization.xcodeproj/xcshareddata/xcschemes/GSLCSVSerialization.xcscheme

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

GSLCSVSerialization/GSLCSVSerialization.m

@@ -113,7 +113,15 @@ static NSInteger __GSLCSVWriteRecord(NSOutputStream *stream, NSArray<NSString *>
                 result += bytesWritten;
             }
         }
-        NSString *field = fields[i];
+        NSString *field = ^{
+            if (@available(macOS 10.8, *)) {
+                // macOS 10.8+
+                return fields[i];
+            } else {
+                // macOS 10.6-10.8
+                return [fields objectAtIndex:i];
+            }
+        }();
         if (field.length == 0) {
             continue;
         }
@@ -384,7 +392,15 @@ + (NSInteger)writeCSVRecords:(NSArray<NSArray<NSString *> *> *)records toStream:
                 result += bytesWritten;
             }
         }
-        NSArray<NSString *> *fields = records[i];
+        NSArray<NSString *> *fields = ^{
+            if (@available(macOS 10.8, *)) {
+                // macOS 10.8+
+                return records[i];
+            } else {
+                // macOS 10.6-10.8
+                return [records objectAtIndex:i];
+            }
+        }();
         NSError *error = nil;
         NSInteger bytesWritten = __GSLCSVWriteRecord(stream, fields, encoding, opt, &error);
         if (bytesWritten < 0) {

README.md

@@ -2,12 +2,12 @@
 
 [![Build Status](https://travis-ci.org/GyazSquare/GSLCSVSerialization.svg?branch=master)](https://travis-ci.org/GyazSquare/GSLCSVSerialization)
 
-GSLCSVSerialization is an Objective-C CSV parser for iOS, OS X, watchOS and tvOS.
+GSLCSVSerialization is an Objective-C CSV parser for iOS, macOS, watchOS and tvOS.
 
 ## Requirements
 
-* Xcode 9.2 or later
-* Base SDK: iOS 11.2 / OS X 10.13.2 / watchOS 4.2 / tvOS 11.2 or later
+* Xcode 9.3 or later
+* Base SDK: iOS 11.3 / macOS 10.13.4 / watchOS 4.3 / tvOS 11.3 or later
 * Deployment Target: iOS 8.0 / OS X 10.6 / watchOS 2.0 / tvOS 9.0  or later
 
 ## Installation

scripts/travis-run-tests.sh

@@ -3,7 +3,7 @@
 set -ev
 set -o pipefail
 
-IOS_SIMULATOR_ID=`xcrun instruments -s devices 2>/dev/null | sed -n -E 's/^iPhone 8 Plus \(11\.2\)[^+]*\[([[:xdigit:]-]{36})\].*\(Simulator\)$/\1/p' | sed -n -e 1p`
+IOS_SIMULATOR_ID=`xcrun instruments -s devices 2>/dev/null | sed -n -E 's/^iPhone 8 \(11\.3\)[^+]*\[([[:xdigit:]-]{36})\].*\(Simulator\)$/\1/p' | sed -n -e 1p`
 
 if [ "${TRAVIS_XCODE_PROJECT-UNDEF}" != "UNDEF" ]; then
     xcodebuild -project ${TRAVIS_XCODE_PROJECT} -scheme ${TRAVIS_XCODE_SCHEME} -destination "id=${IOS_SIMULATOR_ID}" -sdk ${TRAVIS_XCODE_SDK} test