Merge branch 'release/v3.0.0'

.dir-locals.el

@@ -1,28 +1,28 @@
 ;;; Directory Local Variables
 ;;; For more information see (info "(emacs) Directory Variables")
 
-((nil
+(("GSLCSVSerializationTests"
+  . ((objc-mode
+      . ((eval . (add-to-list
+                  'flycheck-objc-clang-framework-paths
+                  (expand-file-name
+                   "Platforms/iPhoneOS.platform/Developer/Library/Frameworks"
+                   (getenv "DEVELOPER_DIR"))))))))
+ (objc-mode
+  . ((flycheck-objc-clang-xcrun-sdk . "iphoneos")
+     (flycheck-objc-clang-arc . t)
+     (flycheck-objc-clang-modules . t)
+     (flycheck-objc-clang-archs . ("arm64" "armv7"))
+     (flycheck-objc-clang-ios-version-min . "8.0")
+     (eval . (set 'flycheck-objc-clang-include-paths (list srcroot)))))
+ (nil
   . ((eval . (setenv "DEVELOPER_DIR"
                      "/Applications/Xcode.app/Contents/Developer"))
      (fill-column . 80)
      (whitespace-style . (face lines indentation:space))
      (eval . (set (make-local-variable 'project-dir)
                   (file-name-directory
-                   (let ((d (dir-locals-find-file ".")))
+                   (let ((d (or (dir-locals-find-file ".") default-directory)))
                      (if (stringp d) d (car d))))))
      (eval . (set (make-local-variable 'srcroot)
-                  (expand-file-name "GSLCSVSerialization" project-dir)))))
- (objc-mode
-  . ((flycheck-objc-clang-xcrun-sdk . "iphoneos")
-     (flycheck-objc-clang-arc . t)
-     (flycheck-objc-clang-modules . t)
-     (flycheck-objc-clang-archs . ("arm64" "armv7"))
-     (flycheck-objc-clang-ios-version-min . "8.0")
-     (eval . (set 'flycheck-objc-clang-include-paths (list srcroot)))))
- ("GSLCSVSerializationTests"
-  . ((objc-mode
-      . ((eval . (add-to-list
-                  'flycheck-objc-clang-framework-paths
-                  (expand-file-name
-                   "Platforms/iPhoneOS.platform/Developer/Library/Frameworks"
-                   (getenv "DEVELOPER_DIR")))))))))
+                  (expand-file-name "GSLCSVSerialization" project-dir))))))

.travis.yml

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

GSLCSVSerialization.podspec

@@ -1,10 +1,10 @@
 Pod::Spec.new do |s|
   s.name         = 'GSLCSVSerialization'
-  s.version      = '2.0.3'
+  s.version      = '3.0.0'
   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.3' }
+  s.source       = { :git => 'https://github.com/GyazSquare/GSLCSVSerialization.git', :tag => 'v3.0.0' }
   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'

GSLCSVSerialization.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings

@@ -0,0 +1,5 @@
+<?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/>
+</plist>

GSLCSVSerialization/GSLCSVSerialization.h

@@ -32,7 +32,7 @@ typedef NS_OPTIONS(NSUInteger, GSLCSVWritingOptions) {
 
 @interface GSLCSVSerialization : NSObject
 
-+ (BOOL)isValidCSVRecords:(nullable NSArray<NSArray<NSString *> *> *)records;
++ (BOOL)isValidCSVRecords:(NSArray<NSArray<NSString *> *> *)records;
 
 + (nullable NSData *)dataWithCSVRecords:(NSArray<NSArray<NSString *> *> *)records encoding:(NSStringEncoding)encoding options:(GSLCSVWritingOptions)opt error:(NSError **)error;
 + (NSInteger)writeCSVRecords:(NSArray<NSArray<NSString *> *> *)records toStream:(NSOutputStream *)stream encoding:(NSStringEncoding)encoding options:(GSLCSVWritingOptions)opt error:(NSError **)error;

GSLCSVSerialization/GSLCSVSerialization.m

@@ -339,7 +339,10 @@ static BOOL __GSLCSVConvertInputStreamToBytes(NSInputStream *stream, void **byte
 
 @implementation GSLCSVSerialization
 
-+ (BOOL)isValidCSVRecords:(nullable NSArray<NSArray<NSString *> *> *)records {
++ (BOOL)isValidCSVRecords:(NSArray<NSArray<NSString *> *> *)records {
+    if (!records) {
+        [NSException raise:NSInvalidArgumentException format:@"*** %s: records parameter is nil", __PRETTY_FUNCTION__];
+    }
     return __GSLCSVIsValidCSVRecords(records, NULL);
 }
 

GSLCSVSerializationTests/GSLCSVSerializationTests.m

@@ -26,7 +26,7 @@ - (void)testIsValidCSVRecords {
     // nil records
     {
         NSArray *records = nil;
-        XCTAssertFalse([GSLCSVSerialization isValidCSVRecords:records]);
+        XCTAssertThrowsSpecificNamed([GSLCSVSerialization isValidCSVRecords:records], NSException, NSInvalidArgumentException);
     }
     // empty records
     {

README.md

@@ -6,8 +6,8 @@ GSLCSVSerialization is an Objective-C CSV parser for iOS, macOS, watchOS and tvO
 
 ## Requirements
 
-* Xcode 9.3 or later
-* Base SDK: iOS 11.3 / macOS 10.13.4 / watchOS 4.3 / tvOS 11.3 or later
+* Xcode 10.1 or later
+* Base SDK: iOS 12.1 / macOS 10.14.1 / watchOS 5.1 / tvOS 12.1 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 \(11\.3\)[^+]*\[([[:xdigit:]-]{36})\].*\(Simulator\)$/\1/p' | sed -n -e 1p`
+IOS_SIMULATOR_ID=`xcrun instruments -s devices 2>/dev/null | sed -n -E 's/^iPhone XR \(12\.1\)[^+]*\[([[: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