diff --git a/.gitignore b/.gitignore index d603a26..9ab17b8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,64 @@ -build -**/*.perspective* -**/*.pbxuser -**/*.mode* -*.xcodeproj/xcworkspace/xcuserdata/** +# Xcode +# +# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore + +## Build generated +build/ +DerivedData/ + +## Various settings +*.pbxuser +!default.pbxuser +*.mode1v3 +!default.mode1v3 +*.mode2v3 +!default.mode2v3 +*.perspectivev3 +!default.perspectivev3 +xcuserdata/ + +## Other +*.moved-aside +*.xccheckout +*.xcscmblueprint .DS_Store -xcuserdata \ No newline at end of file + +## Obj-C/Swift specific +*.hmap +*.ipa +*.dSYM.zip +*.dSYM + +# CocoaPods +# +# We recommend against adding the Pods directory to your .gitignore. However +# you should judge for yourself, the pros and cons are mentioned at: +# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control +# +# Pods/ + +# Carthage +# +# Add this line if you want to avoid checking in source code from Carthage dependencies. +# Carthage/Checkouts + +Carthage/Build + +# fastlane +# +# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the +# screenshots whenever they are needed. +# For more information about the recommended setup visit: +# https://docs.fastlane.tools/best-practices/source-control/#source-control + +fastlane/report.xml +fastlane/Preview.html +fastlane/screenshots +fastlane/test_output + +# Code Injection +# +# After new code Injection tools there's a generated folder /iOSInjectionProject +# https://github.com/johnno1962/injectionforxcode + +iOSInjectionProject/ diff --git a/CHCSVParser.xcodeproj/project.pbxproj b/CHCSVParser.xcodeproj/project.pbxproj index b14b0fa..967071e 100644 --- a/CHCSVParser.xcodeproj/project.pbxproj +++ b/CHCSVParser.xcodeproj/project.pbxproj @@ -17,6 +17,8 @@ 55F79EE01682D6B60095E9D5 /* CHCSVParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 55B99320160E376100D6548A /* CHCSVParser.m */; }; 8DD76F9A0486AA7600D96B5E /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 08FB7796FE84155DC02AAC07 /* main.m */; settings = {ATTRIBUTES = (); }; }; 8DD76F9C0486AA7600D96B5E /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 08FB779EFE84155DC02AAC07 /* Foundation.framework */; }; + CD275E6B207CBC1D00016B61 /* CHCSVParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 55B99320160E376100D6548A /* CHCSVParser.m */; }; + CD275E6C207CBC2B00016B61 /* CHCSVParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 55B9931F160E376100D6548A /* CHCSVParser.h */; settings = {ATTRIBUTES = (Public, ); }; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -35,6 +37,9 @@ 55B99320160E376100D6548A /* CHCSVParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CHCSVParser.m; sourceTree = ""; }; 55C61C60199C0B4600770AA2 /* Issue65.csv */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Issue65.csv; sourceTree = ""; }; 8DD76FA10486AA7600D96B5E /* CHCSVParser */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = CHCSVParser; sourceTree = BUILT_PRODUCTS_DIR; }; + CD275E63207CBC1000016B61 /* CHCSVParser.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = CHCSVParser.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + CD275E65207CBC1000016B61 /* CHCSVParser.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = CHCSVParser.h; path = CHCSVParser/CHCSVParser.h; sourceTree = ""; }; + CD275E66207CBC1000016B61 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -55,6 +60,13 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + CD275E5F207CBC1000016B61 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ @@ -64,6 +76,7 @@ 08FB7795FE84155DC02AAC07 /* Source */, 5560A19D1737433900DDD1D3 /* Unit Tests */, 08FB779DFE84155DC02AAC07 /* External Frameworks and Libraries */, + CD275E64207CBC1000016B61 /* CHCSVParser */, 1AB674ADFE9D54B511CA2CBB /* Products */, ); name = CHCSVParser; @@ -94,6 +107,7 @@ children = ( 8DD76FA10486AA7600D96B5E /* CHCSVParser */, 557FD0531204A70D009FCDBA /* Unit Tests.xctest */, + CD275E63207CBC1000016B61 /* CHCSVParser.framework */, ); name = Products; sourceTree = ""; @@ -121,8 +135,28 @@ path = "Unit Tests"; sourceTree = ""; }; + CD275E64207CBC1000016B61 /* CHCSVParser */ = { + isa = PBXGroup; + children = ( + CD275E65207CBC1000016B61 /* CHCSVParser.h */, + CD275E66207CBC1000016B61 /* Info.plist */, + ); + path = CHCSVParser; + sourceTree = ""; + }; /* End PBXGroup section */ +/* Begin PBXHeadersBuildPhase section */ + CD275E60207CBC1000016B61 /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + CD275E6C207CBC2B00016B61 /* CHCSVParser.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXHeadersBuildPhase section */ + /* Begin PBXNativeTarget section */ 557FD0521204A70D009FCDBA /* Unit Tests */ = { isa = PBXNativeTarget; @@ -141,9 +175,9 @@ productReference = 557FD0531204A70D009FCDBA /* Unit Tests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; - 8DD76F960486AA7600D96B5E /* CHCSVParser */ = { + 8DD76F960486AA7600D96B5E /* CHCSVParserDemo */ = { isa = PBXNativeTarget; - buildConfigurationList = 1DEB927408733DD40010E9CD /* Build configuration list for PBXNativeTarget "CHCSVParser" */; + buildConfigurationList = 1DEB927408733DD40010E9CD /* Build configuration list for PBXNativeTarget "CHCSVParserDemo" */; buildPhases = ( 8DD76F990486AA7600D96B5E /* Sources */, 8DD76F9B0486AA7600D96B5E /* Frameworks */, @@ -152,19 +186,43 @@ ); dependencies = ( ); - name = CHCSVParser; + name = CHCSVParserDemo; productInstallPath = "$(HOME)/bin"; productName = CHCSVParser; productReference = 8DD76FA10486AA7600D96B5E /* CHCSVParser */; productType = "com.apple.product-type.tool"; }; + CD275E62207CBC1000016B61 /* CHCSVParser */ = { + isa = PBXNativeTarget; + buildConfigurationList = CD275E68207CBC1000016B61 /* Build configuration list for PBXNativeTarget "CHCSVParser" */; + buildPhases = ( + CD275E5E207CBC1000016B61 /* Sources */, + CD275E5F207CBC1000016B61 /* Frameworks */, + CD275E60207CBC1000016B61 /* Headers */, + CD275E61207CBC1000016B61 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = CHCSVParser; + productName = CHCSVParser; + productReference = CD275E63207CBC1000016B61 /* CHCSVParser.framework */; + productType = "com.apple.product-type.framework"; + }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ 08FB7793FE84155DC02AAC07 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0830; + LastUpgradeCheck = 0930; + TargetAttributes = { + CD275E62207CBC1000016B61 = { + CreatedOnToolsVersion = 9.3; + ProvisioningStyle = Automatic; + }; + }; }; buildConfigurationList = 1DEB927808733DD40010E9CD /* Build configuration list for PBXProject "CHCSVParser" */; compatibilityVersion = "Xcode 3.2"; @@ -180,8 +238,9 @@ projectDirPath = ""; projectRoot = ""; targets = ( - 8DD76F960486AA7600D96B5E /* CHCSVParser */, + 8DD76F960486AA7600D96B5E /* CHCSVParserDemo */, 557FD0521204A70D009FCDBA /* Unit Tests */, + CD275E62207CBC1000016B61 /* CHCSVParser */, ); }; /* End PBXProject section */ @@ -197,6 +256,13 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + CD275E61207CBC1000016B61 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXResourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -218,6 +284,14 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + CD275E5E207CBC1000016B61 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + CD275E6B207CBC1D00016B61 /* CHCSVParser.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXSourcesBuildPhase section */ /* Begin XCBuildConfiguration section */ @@ -250,12 +324,20 @@ buildSettings = { CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; 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_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; @@ -280,12 +362,20 @@ buildSettings = { CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; 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_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; @@ -356,10 +446,102 @@ }; name = Release; }; + CD275E69207CBC1000016B61 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CODE_SIGN_IDENTITY = "-"; + CODE_SIGN_STYLE = Automatic; + COMBINE_HIDPI_IMAGES = YES; + COPY_PHASE_STRIP = NO; + CURRENT_PROJECT_VERSION = 1; + DEBUG_INFORMATION_FORMAT = dwarf; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + FRAMEWORK_VERSION = A; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_DYNAMIC_NO_PIC = NO; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + INFOPLIST_FILE = CHCSVParser/Info.plist; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @executable_path/Frameworks @loader_path/Frameworks @loader_path/../Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.13; + MTL_ENABLE_DEBUG_INFO = YES; + PRODUCT_BUNDLE_IDENTIFIER = com.ideasoncanvas.CHCSVParser; + PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + RESOURCES_TARGETED_DEVICE_FAMILY = "1,2,3,4"; + SKIP_INSTALL = YES; + SUPPORTED_PLATFORMS = "macosx iphoneos appletvos watchos appletvsimulator iphonesimulator watchsimulator"; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Debug; + }; + CD275E6A207CBC1000016B61 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CODE_SIGN_IDENTITY = "-"; + CODE_SIGN_STYLE = Automatic; + COMBINE_HIDPI_IMAGES = YES; + COPY_PHASE_STRIP = NO; + CURRENT_PROJECT_VERSION = 1; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_NS_ASSERTIONS = NO; + FRAMEWORK_VERSION = A; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + INFOPLIST_FILE = CHCSVParser/Info.plist; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @executable_path/Frameworks @loader_path/Frameworks @loader_path/../Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.13; + MTL_ENABLE_DEBUG_INFO = NO; + PRODUCT_BUNDLE_IDENTIFIER = com.ideasoncanvas.CHCSVParser; + PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + RESOURCES_TARGETED_DEVICE_FAMILY = "1,2,3,4"; + SKIP_INSTALL = YES; + SUPPORTED_PLATFORMS = "macosx iphoneos appletvos watchos appletvsimulator iphonesimulator watchsimulator"; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Release; + }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 1DEB927408733DD40010E9CD /* Build configuration list for PBXNativeTarget "CHCSVParser" */ = { + 1DEB927408733DD40010E9CD /* Build configuration list for PBXNativeTarget "CHCSVParserDemo" */ = { isa = XCConfigurationList; buildConfigurations = ( 1DEB927508733DD40010E9CD /* Debug */, @@ -386,6 +568,15 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; + CD275E68207CBC1000016B61 /* Build configuration list for PBXNativeTarget "CHCSVParser" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + CD275E69207CBC1000016B61 /* Debug */, + CD275E6A207CBC1000016B61 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; /* End XCConfigurationList section */ }; rootObject = 08FB7793FE84155DC02AAC07 /* Project object */; diff --git a/CHCSVParser.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/CHCSVParser.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/CHCSVParser.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/CHCSVParser/CHCSVParser/CHCSVParserOptions.swift b/CHCSVParser/CHCSVParser/CHCSVParserOptions.swift deleted file mode 100644 index fc34583..0000000 --- a/CHCSVParser/CHCSVParser/CHCSVParserOptions.swift +++ /dev/null @@ -1,9 +0,0 @@ -// -// CHCSVParserOptions.swift -// CHCSVParser -// -// Created by Dave DeLong on 3/7/15. -// -// - -import Foundation diff --git a/CHCSVParser/Info.plist b/CHCSVParser/Info.plist new file mode 100644 index 0000000..1007fd9 --- /dev/null +++ b/CHCSVParser/Info.plist @@ -0,0 +1,24 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + FMWK + CFBundleShortVersionString + 1.0 + CFBundleVersion + $(CURRENT_PROJECT_VERSION) + NSPrincipalClass + + +