From 5e0a02ee0bf9d98db928835826680228a0533a32 Mon Sep 17 00:00:00 2001 From: Goichi Hirakawa Date: Fri, 6 Dec 2019 20:52:56 +0900 Subject: [PATCH 1/5] refs #28 Modernize project settings for Xcode 11 --- GSLCSVSerialization.xcodeproj/project.pbxproj | 4 ++-- .../xcshareddata/WorkspaceSettings.xcsettings | 5 +++- .../xcschemes/GSLCSVSerialization.xcscheme | 24 ++++++++----------- 3 files changed, 16 insertions(+), 17 deletions(-) diff --git a/GSLCSVSerialization.xcodeproj/project.pbxproj b/GSLCSVSerialization.xcodeproj/project.pbxproj index 44cf901..0ce6c73 100644 --- a/GSLCSVSerialization.xcodeproj/project.pbxproj +++ b/GSLCSVSerialization.xcodeproj/project.pbxproj @@ -155,7 +155,7 @@ D7B2F4951B0442F000C877F6 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0930; + LastUpgradeCheck = 1120; TargetAttributes = { D7B2F49C1B0442F000C877F6 = { CreatedOnToolsVersion = 6.3.2; @@ -167,7 +167,7 @@ }; buildConfigurationList = D7B2F4981B0442F000C877F6 /* Build configuration list for PBXProject "GSLCSVSerialization" */; compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( en, diff --git a/GSLCSVSerialization.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/GSLCSVSerialization.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings index 0c67376..f9b0d7c 100644 --- a/GSLCSVSerialization.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings +++ b/GSLCSVSerialization.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -1,5 +1,8 @@ - + + PreviewsEnabled + + diff --git a/GSLCSVSerialization.xcodeproj/xcshareddata/xcschemes/GSLCSVSerialization.xcscheme b/GSLCSVSerialization.xcodeproj/xcshareddata/xcschemes/GSLCSVSerialization.xcscheme index f8add78..08af00d 100644 --- a/GSLCSVSerialization.xcodeproj/xcshareddata/xcschemes/GSLCSVSerialization.xcscheme +++ b/GSLCSVSerialization.xcodeproj/xcshareddata/xcschemes/GSLCSVSerialization.xcscheme @@ -1,6 +1,6 @@ + + + + @@ -53,17 +62,6 @@ - - - - - - - - Date: Fri, 6 Dec 2019 20:55:13 +0900 Subject: [PATCH 2/5] refs #28 Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 985c503..674cc3b 100644 --- a/README.md +++ b/README.md @@ -6,8 +6,8 @@ GSLCSVSerialization is an Objective-C CSV parser for iOS, macOS, watchOS and tvO ## Requirements -* Xcode 10.1 or later -* Base SDK: iOS 12.1 / macOS 10.14.1 / watchOS 5.1 / tvOS 12.1 or later +* Xcode 11.2 or later +* Base SDK: iOS 13.2 / macOS 10.15 / watchOS 6.1 / tvOS 13.2 or later * Deployment Target: iOS 8.0 / OS X 10.6 / watchOS 2.0 / tvOS 9.0 or later ## Installation From 1b2022af13702b6a5baaf84fc759ca0b9d2c0dc5 Mon Sep 17 00:00:00 2001 From: Goichi Hirakawa Date: Fri, 6 Dec 2019 20:56:33 +0900 Subject: [PATCH 3/5] refs #28 Update Travis CI settings for Xcode 11 --- .travis.yml | 4 ++-- scripts/travis-run-tests.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index e2e7033..0339627 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,8 @@ language: objective-c -osx_image: xcode10.1 +osx_image: xcode11.2 xcode_project: GSLCSVSerialization.xcodeproj xcode_scheme: GSLCSVSerialization -xcode_sdk: iphonesimulator12.1 +xcode_sdk: iphonesimulator13.2 before_install: - gem install xcpretty script: diff --git a/scripts/travis-run-tests.sh b/scripts/travis-run-tests.sh index cfc1b31..9eba3d0 100755 --- a/scripts/travis-run-tests.sh +++ b/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 XR \(12\.1\)[^+]*\[([[:xdigit:]-]{36})\].*\(Simulator\)$/\1/p' | sed -n -e 1p` +IOS_SIMULATOR_ID=`xcrun instruments -s devices 2>/dev/null | sed -n -E 's/^iPhone 11 Pro Max \(13\.2\.2\)[^+]*\[([[: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 From 21b0b89f6a9b904f7fb1d9fe03ddad47975a10c8 Mon Sep 17 00:00:00 2001 From: Goichi Hirakawa Date: Fri, 6 Dec 2019 21:24:32 +0900 Subject: [PATCH 4/5] refs #30 Update the copyright year --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index db81eec..0c4c4e7 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2017-2018 GyazSquare Inc. +Copyright (c) 2017-2019 GyazSquare Inc. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From 416213bad48f09c9920f610d362c3e95adb6adcb Mon Sep 17 00:00:00 2001 From: Goichi Hirakawa Date: Fri, 6 Dec 2019 21:25:17 +0900 Subject: [PATCH 5/5] refs #30 Update version to v4.0.0 --- GSLCSVSerialization.podspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/GSLCSVSerialization.podspec b/GSLCSVSerialization.podspec index 1e33e2c..84c7952 100644 --- a/GSLCSVSerialization.podspec +++ b/GSLCSVSerialization.podspec @@ -1,10 +1,10 @@ Pod::Spec.new do |s| s.name = 'GSLCSVSerialization' - s.version = '3.0.1' + s.version = '4.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 => 'v3.0.1' } + s.source = { :git => 'https://github.com/GyazSquare/GSLCSVSerialization.git', :tag => 'v4.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'