From 39ace3eff36ca823ee8e31f388dcc3e6f4fc85b1 Mon Sep 17 00:00:00 2001 From: Ernesto Rivera Date: Fri, 9 Jun 2017 14:44:04 -0400 Subject: [PATCH] Update Demo project --- Demo/ConsoleDemo.xcodeproj/project.pbxproj | 1214 ++++++----------- .../xcschemes/ConsoleDemo.xcscheme | 19 +- .../contents.xcworkspacedata | 11 +- Demo/ConsoleDemo/AppDelegate.m | 9 - Demo/ConsoleDemo/ConsoleDemo-Info.plist | 2 +- Demo/ConsoleDemo/ConsoleDemo-Prefix.pch | 2 + Demo/Podfile | 18 +- Demo/Podfile.lock | 32 +- .../CocoaLumberjack/Classes/CocoaLumberjack.h | 7 +- .../Classes/CocoaLumberjack.swift | 92 +- .../CocoaLumberjack/Classes/DDASLLogCapture.h | 17 +- .../CocoaLumberjack/Classes/DDASLLogCapture.m | 51 +- .../CocoaLumberjack/Classes/DDASLLogger.h | 18 +- .../CocoaLumberjack/Classes/DDASLLogger.m | 13 +- .../Classes/DDAbstractDatabaseLogger.h | 15 +- .../Classes/DDAbstractDatabaseLogger.m | 10 +- .../CocoaLumberjack/Classes/DDAssertMacros.h | 2 +- .../CocoaLumberjack/Classes/DDFileLogger.h | 285 ++-- .../CocoaLumberjack/Classes/DDFileLogger.m | 120 +- .../CocoaLumberjack/Classes/DDLegacyMacros.h | 4 +- .../Pods/CocoaLumberjack/Classes/DDLog+LOGV.h | 14 +- Demo/Pods/CocoaLumberjack/Classes/DDLog.h | 517 +++++-- Demo/Pods/CocoaLumberjack/Classes/DDLog.m | 466 +++++-- .../CocoaLumberjack/Classes/DDLogMacros.h | 31 +- .../Pods/CocoaLumberjack/Classes/DDOSLogger.h | 38 + .../Pods/CocoaLumberjack/Classes/DDOSLogger.m | 77 ++ .../CocoaLumberjack/Classes/DDTTYLogger.h | 69 +- .../CocoaLumberjack/Classes/DDTTYLogger.m | 67 +- .../Extensions/DDContextFilterLogFormatter.h | 48 +- .../Extensions/DDContextFilterLogFormatter.m | 3 +- .../Extensions/DDDispatchQueueLogFormatter.h | 73 +- .../Extensions/DDDispatchQueueLogFormatter.m | 83 +- .../Classes/Extensions/DDMultiFormatter.h | 26 +- .../Classes/Extensions/DDMultiFormatter.m | 7 +- .../Lumberjack/CocoaLumberjack.modulemap | 36 + Demo/Pods/CocoaLumberjack/LICENSE.txt | 2 +- Demo/Pods/CocoaLumberjack/README.md | 140 +- .../Private/CocoaLumberjack/DDOSLogger.h | 1 + .../Public/CocoaLumberjack/DDOSLogger.h | 1 + .../LumberjackConsole.podspec.json | 8 +- Demo/Pods/Manifest.lock | 32 +- Demo/Pods/NBUCore/LICENSE | 2 +- Demo/Pods/NBUCore/NOTICE | 2 +- Demo/Pods/NBUCore/README.md | 4 +- Demo/Pods/NBUCore/Source/NBUAvailability.h | 58 +- Demo/Pods/NBUCore/Source/NBUCore.h | 2 +- Demo/Pods/NBUCore/Source/NBUCore.m | 2 +- Demo/Pods/Pods.xcodeproj/project.pbxproj | 988 +++++++------- .../CocoaLumberjack/CocoaLumberjack-dummy.m | 5 + .../CocoaLumberjack-prefix.pch | 12 + .../CocoaLumberjack.xcconfig} | 9 +- .../LumberjackConsole-dummy.m | 5 + .../LumberjackConsole-prefix.pch | 12 + .../LumberjackConsole.xcconfig | 10 + .../NBUCore/NBUCore-dummy.m | 5 + .../NBUCore/NBUCore-prefix.pch | 12 + .../NBUCore.xcconfig} | 9 +- .../Pods-CocoaLumberjack-dummy.m | 5 - .../Pods-CocoaLumberjack-prefix.pch | 5 - .../Pods-CocoaLumberjack.xcconfig | 0 ...ods-ConsoleDemo-acknowledgements.markdown} | 6 +- .../Pods-ConsoleDemo-acknowledgements.plist} | 12 +- .../Pods-ConsoleDemo/Pods-ConsoleDemo-dummy.m | 5 + .../Pods-ConsoleDemo-frameworks.sh | 92 ++ .../Pods-ConsoleDemo-resources.sh | 108 ++ .../Pods-ConsoleDemo.debug.xcconfig} | 9 +- .../Pods-ConsoleDemo.release.xcconfig} | 9 +- .../Pods-LumberjackConsole-Private.xcconfig | 6 - .../Pods-LumberjackConsole-dummy.m | 5 - .../Pods-LumberjackConsole-prefix.pch | 5 - .../Pods-LumberjackConsole.xcconfig | 0 .../Pods-NBUCore/Pods-NBUCore-dummy.m | 5 - .../Pods-NBUCore/Pods-NBUCore-prefix.pch | 5 - .../Pods-NBUCore/Pods-NBUCore.xcconfig | 0 .../Target Support Files/Pods/Pods-dummy.m | 5 - .../Pods/Pods-environment.h | 44 - .../Pods/Pods-resources.sh | 83 -- 77 files changed, 3122 insertions(+), 2104 deletions(-) mode change 100755 => 100644 Demo/Pods/CocoaLumberjack/Classes/DDASLLogger.h create mode 100644 Demo/Pods/CocoaLumberjack/Classes/DDOSLogger.h create mode 100644 Demo/Pods/CocoaLumberjack/Classes/DDOSLogger.m create mode 100644 Demo/Pods/CocoaLumberjack/Framework/Lumberjack/CocoaLumberjack.modulemap create mode 120000 Demo/Pods/Headers/Private/CocoaLumberjack/DDOSLogger.h create mode 120000 Demo/Pods/Headers/Public/CocoaLumberjack/DDOSLogger.h create mode 100644 Demo/Pods/Target Support Files/CocoaLumberjack/CocoaLumberjack-dummy.m create mode 100644 Demo/Pods/Target Support Files/CocoaLumberjack/CocoaLumberjack-prefix.pch rename Demo/Pods/Target Support Files/{Pods-CocoaLumberjack/Pods-CocoaLumberjack-Private.xcconfig => CocoaLumberjack/CocoaLumberjack.xcconfig} (50%) create mode 100644 Demo/Pods/Target Support Files/LumberjackConsole/LumberjackConsole-dummy.m create mode 100644 Demo/Pods/Target Support Files/LumberjackConsole/LumberjackConsole-prefix.pch create mode 100644 Demo/Pods/Target Support Files/LumberjackConsole/LumberjackConsole.xcconfig create mode 100644 Demo/Pods/Target Support Files/NBUCore/NBUCore-dummy.m create mode 100644 Demo/Pods/Target Support Files/NBUCore/NBUCore-prefix.pch rename Demo/Pods/Target Support Files/{Pods-NBUCore/Pods-NBUCore-Private.xcconfig => NBUCore/NBUCore.xcconfig} (50%) delete mode 100644 Demo/Pods/Target Support Files/Pods-CocoaLumberjack/Pods-CocoaLumberjack-dummy.m delete mode 100644 Demo/Pods/Target Support Files/Pods-CocoaLumberjack/Pods-CocoaLumberjack-prefix.pch delete mode 100644 Demo/Pods/Target Support Files/Pods-CocoaLumberjack/Pods-CocoaLumberjack.xcconfig rename Demo/Pods/Target Support Files/{Pods/Pods-acknowledgements.markdown => Pods-ConsoleDemo/Pods-ConsoleDemo-acknowledgements.markdown} (99%) rename Demo/Pods/Target Support Files/{Pods/Pods-acknowledgements.plist => Pods-ConsoleDemo/Pods-ConsoleDemo-acknowledgements.plist} (98%) create mode 100644 Demo/Pods/Target Support Files/Pods-ConsoleDemo/Pods-ConsoleDemo-dummy.m create mode 100755 Demo/Pods/Target Support Files/Pods-ConsoleDemo/Pods-ConsoleDemo-frameworks.sh create mode 100755 Demo/Pods/Target Support Files/Pods-ConsoleDemo/Pods-ConsoleDemo-resources.sh rename Demo/Pods/Target Support Files/{Pods/Pods.debug.xcconfig => Pods-ConsoleDemo/Pods-ConsoleDemo.debug.xcconfig} (51%) rename Demo/Pods/Target Support Files/{Pods/Pods.release.xcconfig => Pods-ConsoleDemo/Pods-ConsoleDemo.release.xcconfig} (51%) delete mode 100644 Demo/Pods/Target Support Files/Pods-LumberjackConsole/Pods-LumberjackConsole-Private.xcconfig delete mode 100644 Demo/Pods/Target Support Files/Pods-LumberjackConsole/Pods-LumberjackConsole-dummy.m delete mode 100644 Demo/Pods/Target Support Files/Pods-LumberjackConsole/Pods-LumberjackConsole-prefix.pch delete mode 100644 Demo/Pods/Target Support Files/Pods-LumberjackConsole/Pods-LumberjackConsole.xcconfig delete mode 100644 Demo/Pods/Target Support Files/Pods-NBUCore/Pods-NBUCore-dummy.m delete mode 100644 Demo/Pods/Target Support Files/Pods-NBUCore/Pods-NBUCore-prefix.pch delete mode 100644 Demo/Pods/Target Support Files/Pods-NBUCore/Pods-NBUCore.xcconfig delete mode 100644 Demo/Pods/Target Support Files/Pods/Pods-dummy.m delete mode 100644 Demo/Pods/Target Support Files/Pods/Pods-environment.h delete mode 100755 Demo/Pods/Target Support Files/Pods/Pods-resources.sh diff --git a/Demo/ConsoleDemo.xcodeproj/project.pbxproj b/Demo/ConsoleDemo.xcodeproj/project.pbxproj index 0a0367f..bafe5b2 100644 --- a/Demo/ConsoleDemo.xcodeproj/project.pbxproj +++ b/Demo/ConsoleDemo.xcodeproj/project.pbxproj @@ -1,811 +1,403 @@ - - - - - archiveVersion - 1 - classes - - objectVersion - 46 - objects - - 12B78BCD8FEC46FC9EE5EDAC - - buildActionMask - 2147483647 - files - - inputPaths - - isa - PBXShellScriptBuildPhase - name - Copy Pods Resources - outputPaths - - runOnlyForDeploymentPostprocessing - 0 - shellPath - /bin/sh - shellScript - "${SRCROOT}/Pods/Target Support Files/Pods/Pods-resources.sh" - - showEnvVarsInLog - 0 - - 20ECBBDC5A8180B0C4071B5C - - includeInIndex - 1 - isa - PBXFileReference - lastKnownFileType - text.xcconfig - name - Pods.release.xcconfig - path - Pods/Target Support Files/Pods/Pods.release.xcconfig - sourceTree - <group> - - 2849B8B41052A48E0BBC5BB5 - - children - - 64556FF513E2CC9CF8FF9870 - 20ECBBDC5A8180B0C4071B5C - - isa - PBXGroup - name - Pods - sourceTree - <group> - - 484D70DE230E4C7EA6E56506 - - fileRef - A00498F4060049EEA20EE506 - isa - PBXBuildFile - - 629388B2E4364AB29B64B707 - - buildActionMask - 2147483647 - files - - inputPaths - - isa - PBXShellScriptBuildPhase - name - Check Pods Manifest.lock - outputPaths - - runOnlyForDeploymentPostprocessing - 0 - shellPath - /bin/sh - shellScript - diff "${PODS_ROOT}/../Podfile.lock" "${PODS_ROOT}/Manifest.lock" > /dev/null -if [[ $? != 0 ]] ; then - cat << EOM -error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation. -EOM - exit 1 -fi - - showEnvVarsInLog - 0 - - 64556FF513E2CC9CF8FF9870 - - includeInIndex - 1 - isa - PBXFileReference - lastKnownFileType - text.xcconfig - name - Pods.debug.xcconfig - path - Pods/Target Support Files/Pods/Pods.debug.xcconfig - sourceTree - <group> - - A00498F4060049EEA20EE506 - - explicitFileType - archive.ar - includeInIndex - 0 - isa - PBXFileReference - path - libPods.a - sourceTree - BUILT_PRODUCTS_DIR - - E57766CC18334DF6009F3276 - - children - - E57766DE18334DF6009F3276 - E57766D718334DF6009F3276 - E57766D618334DF6009F3276 - 2849B8B41052A48E0BBC5BB5 - - isa - PBXGroup - sourceTree - <group> - - E57766CD18334DF6009F3276 - - attributes - - LastUpgradeCheck - 0510 - ORGANIZATIONNAME - - - buildConfigurationList - E57766D018334DF6009F3276 - compatibilityVersion - Xcode 3.2 - developmentRegion - English - hasScannedForEncodings - 0 - isa - PBXProject - knownRegions - - en - Base - - mainGroup - E57766CC18334DF6009F3276 - productRefGroup - E57766D618334DF6009F3276 - projectDirPath - - projectReferences - - projectRoot - - targets - - E57766D418334DF6009F3276 - - - E57766D018334DF6009F3276 - - buildConfigurations - - E577670818334DF7009F3276 - E577670918334DF7009F3276 - - defaultConfigurationIsVisible - 0 - defaultConfigurationName - Release - isa - XCConfigurationList - - E57766D118334DF6009F3276 - - buildActionMask - 2147483647 - files - - E57766F218334DF6009F3276 - E57766E918334DF6009F3276 - E57766E518334DF6009F3276 - - isa - PBXSourcesBuildPhase - runOnlyForDeploymentPostprocessing - 0 - - E57766D218334DF6009F3276 - - buildActionMask - 2147483647 - files - - E57766DB18334DF6009F3276 - E57766DD18334DF6009F3276 - E57766D918334DF6009F3276 - 484D70DE230E4C7EA6E56506 - - isa - PBXFrameworksBuildPhase - runOnlyForDeploymentPostprocessing - 0 - - E57766D318334DF6009F3276 - - buildActionMask - 2147483647 - files - - E57766F418334DF6009F3276 - E57766EC18334DF6009F3276 - E57766E318334DF6009F3276 - - isa - PBXResourcesBuildPhase - runOnlyForDeploymentPostprocessing - 0 - - E57766D418334DF6009F3276 - - buildConfigurationList - E577670A18334DF7009F3276 - buildPhases - - 629388B2E4364AB29B64B707 - E57766D118334DF6009F3276 - E57766D218334DF6009F3276 - E57766D318334DF6009F3276 - 12B78BCD8FEC46FC9EE5EDAC - - buildRules - - dependencies - - isa - PBXNativeTarget - name - ConsoleDemo - productName - ConsoleDemo - productReference - E57766D518334DF6009F3276 - productType - com.apple.product-type.application - - E57766D518334DF6009F3276 - - explicitFileType - wrapper.application - includeInIndex - 0 - isa - PBXFileReference - path - ConsoleDemo.app - sourceTree - BUILT_PRODUCTS_DIR - - E57766D618334DF6009F3276 - - children - - E57766D518334DF6009F3276 - - isa - PBXGroup - name - Products - sourceTree - <group> - - E57766D718334DF6009F3276 - - children - - E57766D818334DF6009F3276 - E57766DA18334DF6009F3276 - E57766DC18334DF6009F3276 - E57766FA18334DF7009F3276 - A00498F4060049EEA20EE506 - - isa - PBXGroup - name - Frameworks - sourceTree - <group> - - E57766D818334DF6009F3276 - - isa - PBXFileReference - lastKnownFileType - wrapper.framework - name - Foundation.framework - path - System/Library/Frameworks/Foundation.framework - sourceTree - SDKROOT - - E57766D918334DF6009F3276 - - fileRef - E57766D818334DF6009F3276 - isa - PBXBuildFile - - E57766DA18334DF6009F3276 - - isa - PBXFileReference - lastKnownFileType - wrapper.framework - name - CoreGraphics.framework - path - System/Library/Frameworks/CoreGraphics.framework - sourceTree - SDKROOT - - E57766DB18334DF6009F3276 - - fileRef - E57766DA18334DF6009F3276 - isa - PBXBuildFile - - E57766DC18334DF6009F3276 - - isa - PBXFileReference - lastKnownFileType - wrapper.framework - name - UIKit.framework - path - System/Library/Frameworks/UIKit.framework - sourceTree - SDKROOT - - E57766DD18334DF6009F3276 - - fileRef - E57766DC18334DF6009F3276 - isa - PBXBuildFile - - E57766DE18334DF6009F3276 - - children - - E57766E718334DF6009F3276 - E57766E818334DF6009F3276 - E57766EA18334DF6009F3276 - E57766F018334DF6009F3276 - E57766F118334DF6009F3276 - E57766F318334DF6009F3276 - E57766DF18334DF6009F3276 - - isa - PBXGroup - path - ConsoleDemo - sourceTree - <group> - - E57766DF18334DF6009F3276 - - children - - E57766E018334DF6009F3276 - E57766E118334DF6009F3276 - E57766E418334DF6009F3276 - E57766E618334DF6009F3276 - - isa - PBXGroup - name - Supporting Files - sourceTree - <group> - - E57766E018334DF6009F3276 - - isa - PBXFileReference - lastKnownFileType - text.plist.xml - path - ConsoleDemo-Info.plist - sourceTree - <group> - - E57766E118334DF6009F3276 - - children - - E57766E218334DF6009F3276 - - isa - PBXVariantGroup - name - InfoPlist.strings - sourceTree - <group> - - E57766E218334DF6009F3276 - - isa - PBXFileReference - lastKnownFileType - text.plist.strings - name - en - path - en.lproj/InfoPlist.strings - sourceTree - <group> - - E57766E318334DF6009F3276 - - fileRef - E57766E118334DF6009F3276 - isa - PBXBuildFile - - E57766E418334DF6009F3276 - - isa - PBXFileReference - lastKnownFileType - sourcecode.c.objc - path - main.m - sourceTree - <group> - - E57766E518334DF6009F3276 - - fileRef - E57766E418334DF6009F3276 - isa - PBXBuildFile - - E57766E618334DF6009F3276 - - isa - PBXFileReference - lastKnownFileType - sourcecode.c.h - path - ConsoleDemo-Prefix.pch - sourceTree - <group> - - E57766E718334DF6009F3276 - - isa - PBXFileReference - lastKnownFileType - sourcecode.c.h - path - AppDelegate.h - sourceTree - <group> - - E57766E818334DF6009F3276 - - isa - PBXFileReference - lastKnownFileType - sourcecode.c.objc - path - AppDelegate.m - sourceTree - <group> - - E57766E918334DF6009F3276 - - fileRef - E57766E818334DF6009F3276 - isa - PBXBuildFile - - E57766EA18334DF6009F3276 - - children - - E577671018334E38009F3276 - - isa - PBXVariantGroup - name - Main.storyboard - sourceTree - <group> - - E57766EC18334DF6009F3276 - - fileRef - E57766EA18334DF6009F3276 - isa - PBXBuildFile - - E57766F018334DF6009F3276 - - isa - PBXFileReference - lastKnownFileType - sourcecode.c.h - path - ViewController.h - sourceTree - <group> - - E57766F118334DF6009F3276 - - isa - PBXFileReference - lastKnownFileType - sourcecode.c.objc - path - ViewController.m - sourceTree - <group> - - E57766F218334DF6009F3276 - - fileRef - E57766F118334DF6009F3276 - isa - PBXBuildFile - - E57766F318334DF6009F3276 - - isa - PBXFileReference - lastKnownFileType - folder.assetcatalog - path - Images.xcassets - sourceTree - <group> - - E57766F418334DF6009F3276 - - fileRef - E57766F318334DF6009F3276 - isa - PBXBuildFile - - E57766FA18334DF7009F3276 - - isa - PBXFileReference - lastKnownFileType - wrapper.framework - name - XCTest.framework - path - Library/Frameworks/XCTest.framework - sourceTree - DEVELOPER_DIR - - E577670818334DF7009F3276 - - buildSettings - - ALWAYS_SEARCH_USER_PATHS - NO - CLANG_CXX_LANGUAGE_STANDARD - gnu++0x - CLANG_CXX_LIBRARY - libc++ - CLANG_ENABLE_MODULES - YES - CLANG_ENABLE_OBJC_ARC - YES - CLANG_WARN_BOOL_CONVERSION - YES - CLANG_WARN_CONSTANT_CONVERSION - YES - CLANG_WARN_DIRECT_OBJC_ISA_USAGE - YES_ERROR - CLANG_WARN_EMPTY_BODY - YES - CLANG_WARN_ENUM_CONVERSION - YES - CLANG_WARN_INT_CONVERSION - YES - CLANG_WARN_OBJC_ROOT_CLASS - YES_ERROR - CLANG_WARN__DUPLICATE_METHOD_MATCH - YES - CODE_SIGN_IDENTITY[sdk=iphoneos*] - iPhone Developer - COPY_PHASE_STRIP - NO - GCC_C_LANGUAGE_STANDARD - gnu99 - GCC_DYNAMIC_NO_PIC - NO - GCC_OPTIMIZATION_LEVEL - 0 - GCC_PREPROCESSOR_DEFINITIONS - - DEBUG=1 - $(inherited) - - GCC_SYMBOLS_PRIVATE_EXTERN - NO - GCC_WARN_64_TO_32_BIT_CONVERSION - YES - GCC_WARN_ABOUT_RETURN_TYPE - YES_ERROR - GCC_WARN_UNDECLARED_SELECTOR - YES - GCC_WARN_UNINITIALIZED_AUTOS - YES - GCC_WARN_UNUSED_FUNCTION - YES - GCC_WARN_UNUSED_VARIABLE - YES - IPHONEOS_DEPLOYMENT_TARGET - 5.0 - ONLY_ACTIVE_ARCH - YES - SDKROOT - iphoneos - TARGETED_DEVICE_FAMILY - 1,2 - - isa - XCBuildConfiguration - name - Debug - - E577670918334DF7009F3276 - - buildSettings - - ALWAYS_SEARCH_USER_PATHS - NO - CLANG_CXX_LANGUAGE_STANDARD - gnu++0x - CLANG_CXX_LIBRARY - libc++ - CLANG_ENABLE_MODULES - YES - CLANG_ENABLE_OBJC_ARC - YES - CLANG_WARN_BOOL_CONVERSION - YES - CLANG_WARN_CONSTANT_CONVERSION - YES - CLANG_WARN_DIRECT_OBJC_ISA_USAGE - YES_ERROR - CLANG_WARN_EMPTY_BODY - YES - CLANG_WARN_ENUM_CONVERSION - YES - CLANG_WARN_INT_CONVERSION - YES - CLANG_WARN_OBJC_ROOT_CLASS - YES_ERROR - CLANG_WARN__DUPLICATE_METHOD_MATCH - YES - CODE_SIGN_IDENTITY[sdk=iphoneos*] - iPhone Distribution - COPY_PHASE_STRIP - YES - ENABLE_NS_ASSERTIONS - NO - GCC_C_LANGUAGE_STANDARD - gnu99 - GCC_WARN_64_TO_32_BIT_CONVERSION - YES - GCC_WARN_ABOUT_RETURN_TYPE - YES_ERROR - GCC_WARN_UNDECLARED_SELECTOR - YES - GCC_WARN_UNINITIALIZED_AUTOS - YES - GCC_WARN_UNUSED_FUNCTION - YES - GCC_WARN_UNUSED_VARIABLE - YES - IPHONEOS_DEPLOYMENT_TARGET - 5.0 - SDKROOT - iphoneos - TARGETED_DEVICE_FAMILY - 1,2 - VALIDATE_PRODUCT - YES - - isa - XCBuildConfiguration - name - Release - - E577670A18334DF7009F3276 - - buildConfigurations - - E577670B18334DF7009F3276 - E577670C18334DF7009F3276 - - defaultConfigurationIsVisible - 0 - defaultConfigurationName - Release - isa - XCConfigurationList - - E577670B18334DF7009F3276 - - baseConfigurationReference - 64556FF513E2CC9CF8FF9870 - buildSettings - - ASSETCATALOG_COMPILER_APPICON_NAME - AppIcon - ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME - LaunchImage - GCC_PRECOMPILE_PREFIX_HEADER - YES - GCC_PREFIX_HEADER - ConsoleDemo/ConsoleDemo-Prefix.pch - INFOPLIST_FILE - ConsoleDemo/ConsoleDemo-Info.plist - PRODUCT_NAME - $(TARGET_NAME) - WRAPPER_EXTENSION - app - - isa - XCBuildConfiguration - name - Debug - - E577670C18334DF7009F3276 - - baseConfigurationReference - 20ECBBDC5A8180B0C4071B5C - buildSettings - - ASSETCATALOG_COMPILER_APPICON_NAME - AppIcon - ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME - LaunchImage - GCC_PRECOMPILE_PREFIX_HEADER - YES - GCC_PREFIX_HEADER - ConsoleDemo/ConsoleDemo-Prefix.pch - INFOPLIST_FILE - ConsoleDemo/ConsoleDemo-Info.plist - PRODUCT_NAME - $(TARGET_NAME) - WRAPPER_EXTENSION - app - - isa - XCBuildConfiguration - name - Release - - E577671018334E38009F3276 - - isa - PBXFileReference - lastKnownFileType - file.storyboard - name - en - path - en.lproj/Main.storyboard - sourceTree - <group> - - - rootObject - E57766CD18334DF6009F3276 - - +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 46; + objects = { + +/* Begin PBXBuildFile section */ + 3CDFAA99BC4CAAEC792145E1 /* libPods-ConsoleDemo.a in Frameworks */ = {isa = PBXBuildFile; fileRef = CF7FED148B7ABD12B2484A0B /* libPods-ConsoleDemo.a */; }; + E57766D918334DF6009F3276 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E57766D818334DF6009F3276 /* Foundation.framework */; }; + E57766DB18334DF6009F3276 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E57766DA18334DF6009F3276 /* CoreGraphics.framework */; }; + E57766DD18334DF6009F3276 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E57766DC18334DF6009F3276 /* UIKit.framework */; }; + E57766E318334DF6009F3276 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = E57766E118334DF6009F3276 /* InfoPlist.strings */; }; + E57766E518334DF6009F3276 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = E57766E418334DF6009F3276 /* main.m */; }; + E57766E918334DF6009F3276 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = E57766E818334DF6009F3276 /* AppDelegate.m */; }; + E57766EC18334DF6009F3276 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = E57766EA18334DF6009F3276 /* Main.storyboard */; }; + E57766F218334DF6009F3276 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E57766F118334DF6009F3276 /* ViewController.m */; }; + E57766F418334DF6009F3276 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = E57766F318334DF6009F3276 /* Images.xcassets */; }; +/* End PBXBuildFile section */ + +/* Begin PBXFileReference section */ + C8C68BEAB43A0C716546BC40 /* Pods-ConsoleDemo.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ConsoleDemo.debug.xcconfig"; path = "Pods/Target Support Files/Pods-ConsoleDemo/Pods-ConsoleDemo.debug.xcconfig"; sourceTree = ""; }; + CF7FED148B7ABD12B2484A0B /* libPods-ConsoleDemo.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-ConsoleDemo.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + DFA405CAD83B599E694DC4F2 /* Pods-ConsoleDemo.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ConsoleDemo.release.xcconfig"; path = "Pods/Target Support Files/Pods-ConsoleDemo/Pods-ConsoleDemo.release.xcconfig"; sourceTree = ""; }; + E57766D518334DF6009F3276 /* ConsoleDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ConsoleDemo.app; sourceTree = BUILT_PRODUCTS_DIR; }; + E57766D818334DF6009F3276 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; + E57766DA18334DF6009F3276 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; + E57766DC18334DF6009F3276 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; + E57766E018334DF6009F3276 /* ConsoleDemo-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "ConsoleDemo-Info.plist"; sourceTree = ""; }; + E57766E218334DF6009F3276 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = ""; }; + E57766E418334DF6009F3276 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; + E57766E618334DF6009F3276 /* ConsoleDemo-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "ConsoleDemo-Prefix.pch"; sourceTree = ""; }; + E57766E718334DF6009F3276 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; + E57766E818334DF6009F3276 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = ""; }; + E57766F018334DF6009F3276 /* ViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = ""; }; + E57766F118334DF6009F3276 /* ViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = ""; }; + E57766F318334DF6009F3276 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = ""; }; + E57766FA18334DF7009F3276 /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; }; + E577671018334E38009F3276 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = en; path = en.lproj/Main.storyboard; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + E57766D218334DF6009F3276 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + E57766DB18334DF6009F3276 /* CoreGraphics.framework in Frameworks */, + E57766DD18334DF6009F3276 /* UIKit.framework in Frameworks */, + E57766D918334DF6009F3276 /* Foundation.framework in Frameworks */, + 3CDFAA99BC4CAAEC792145E1 /* libPods-ConsoleDemo.a in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 53A73CC83238DDB62623D2E4 /* Pods */ = { + isa = PBXGroup; + children = ( + C8C68BEAB43A0C716546BC40 /* Pods-ConsoleDemo.debug.xcconfig */, + DFA405CAD83B599E694DC4F2 /* Pods-ConsoleDemo.release.xcconfig */, + ); + name = Pods; + sourceTree = ""; + }; + E57766CC18334DF6009F3276 = { + isa = PBXGroup; + children = ( + E57766DE18334DF6009F3276 /* ConsoleDemo */, + E57766D718334DF6009F3276 /* Frameworks */, + E57766D618334DF6009F3276 /* Products */, + 53A73CC83238DDB62623D2E4 /* Pods */, + ); + sourceTree = ""; + }; + E57766D618334DF6009F3276 /* Products */ = { + isa = PBXGroup; + children = ( + E57766D518334DF6009F3276 /* ConsoleDemo.app */, + ); + name = Products; + sourceTree = ""; + }; + E57766D718334DF6009F3276 /* Frameworks */ = { + isa = PBXGroup; + children = ( + E57766D818334DF6009F3276 /* Foundation.framework */, + E57766DA18334DF6009F3276 /* CoreGraphics.framework */, + E57766DC18334DF6009F3276 /* UIKit.framework */, + E57766FA18334DF7009F3276 /* XCTest.framework */, + CF7FED148B7ABD12B2484A0B /* libPods-ConsoleDemo.a */, + ); + name = Frameworks; + sourceTree = ""; + }; + E57766DE18334DF6009F3276 /* ConsoleDemo */ = { + isa = PBXGroup; + children = ( + E57766E718334DF6009F3276 /* AppDelegate.h */, + E57766E818334DF6009F3276 /* AppDelegate.m */, + E57766EA18334DF6009F3276 /* Main.storyboard */, + E57766F018334DF6009F3276 /* ViewController.h */, + E57766F118334DF6009F3276 /* ViewController.m */, + E57766F318334DF6009F3276 /* Images.xcassets */, + E57766DF18334DF6009F3276 /* Supporting Files */, + ); + path = ConsoleDemo; + sourceTree = ""; + }; + E57766DF18334DF6009F3276 /* Supporting Files */ = { + isa = PBXGroup; + children = ( + E57766E018334DF6009F3276 /* ConsoleDemo-Info.plist */, + E57766E118334DF6009F3276 /* InfoPlist.strings */, + E57766E418334DF6009F3276 /* main.m */, + E57766E618334DF6009F3276 /* ConsoleDemo-Prefix.pch */, + ); + name = "Supporting Files"; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + E57766D418334DF6009F3276 /* ConsoleDemo */ = { + isa = PBXNativeTarget; + buildConfigurationList = E577670A18334DF7009F3276 /* Build configuration list for PBXNativeTarget "ConsoleDemo" */; + buildPhases = ( + C796EE359A5361802B91B22D /* [CP] Check Pods Manifest.lock */, + E57766D118334DF6009F3276 /* Sources */, + E57766D218334DF6009F3276 /* Frameworks */, + E57766D318334DF6009F3276 /* Resources */, + 40BA9AA44DF489A70E584D17 /* [CP] Embed Pods Frameworks */, + 54B63CD09D8F9ADB4BC2DBEE /* [CP] Copy Pods Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = ConsoleDemo; + productName = ConsoleDemo; + productReference = E57766D518334DF6009F3276 /* ConsoleDemo.app */; + productType = "com.apple.product-type.application"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + E57766CD18334DF6009F3276 /* Project object */ = { + isa = PBXProject; + attributes = { + LastUpgradeCheck = 0830; + ORGANIZATIONNAME = ""; + }; + buildConfigurationList = E57766D018334DF6009F3276 /* Build configuration list for PBXProject "ConsoleDemo" */; + compatibilityVersion = "Xcode 3.2"; + developmentRegion = English; + hasScannedForEncodings = 0; + knownRegions = ( + en, + Base, + ); + mainGroup = E57766CC18334DF6009F3276; + productRefGroup = E57766D618334DF6009F3276 /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + E57766D418334DF6009F3276 /* ConsoleDemo */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + E57766D318334DF6009F3276 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + E57766F418334DF6009F3276 /* Images.xcassets in Resources */, + E57766EC18334DF6009F3276 /* Main.storyboard in Resources */, + E57766E318334DF6009F3276 /* InfoPlist.strings in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXShellScriptBuildPhase section */ + 40BA9AA44DF489A70E584D17 /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "[CP] Embed Pods Frameworks"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-ConsoleDemo/Pods-ConsoleDemo-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; + 54B63CD09D8F9ADB4BC2DBEE /* [CP] Copy Pods Resources */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "[CP] Copy Pods Resources"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-ConsoleDemo/Pods-ConsoleDemo-resources.sh\"\n"; + showEnvVarsInLog = 0; + }; + C796EE359A5361802B91B22D /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "[CP] Check Pods Manifest.lock"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n"; + showEnvVarsInLog = 0; + }; +/* End PBXShellScriptBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + E57766D118334DF6009F3276 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + E57766F218334DF6009F3276 /* ViewController.m in Sources */, + E57766E918334DF6009F3276 /* AppDelegate.m in Sources */, + E57766E518334DF6009F3276 /* main.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXVariantGroup section */ + E57766E118334DF6009F3276 /* InfoPlist.strings */ = { + isa = PBXVariantGroup; + children = ( + E57766E218334DF6009F3276 /* en */, + ); + name = InfoPlist.strings; + sourceTree = ""; + }; + E57766EA18334DF6009F3276 /* Main.storyboard */ = { + isa = PBXVariantGroup; + children = ( + E577671018334E38009F3276 /* en */, + ); + name = Main.storyboard; + sourceTree = ""; + }; +/* End PBXVariantGroup section */ + +/* Begin XCBuildConfiguration section */ + E577670818334DF7009F3276 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = 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_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_SYMBOLS_PRIVATE_EXTERN = NO; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Debug; + }; + E577670918334DF7009F3276 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = 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_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; + COPY_PHASE_STRIP = YES; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + }; + name = Release; + }; + E577670B18334DF7009F3276 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = C8C68BEAB43A0C716546BC40 /* Pods-ConsoleDemo.debug.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = "ConsoleDemo/ConsoleDemo-Prefix.pch"; + INFOPLIST_FILE = "ConsoleDemo/ConsoleDemo-Info.plist"; + PRODUCT_BUNDLE_IDENTIFIER = "com.PTEz.${PRODUCT_NAME:rfc1034identifier}"; + PRODUCT_NAME = "$(TARGET_NAME)"; + WRAPPER_EXTENSION = app; + }; + name = Debug; + }; + E577670C18334DF7009F3276 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = DFA405CAD83B599E694DC4F2 /* Pods-ConsoleDemo.release.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = "ConsoleDemo/ConsoleDemo-Prefix.pch"; + INFOPLIST_FILE = "ConsoleDemo/ConsoleDemo-Info.plist"; + PRODUCT_BUNDLE_IDENTIFIER = "com.PTEz.${PRODUCT_NAME:rfc1034identifier}"; + PRODUCT_NAME = "$(TARGET_NAME)"; + WRAPPER_EXTENSION = app; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + E57766D018334DF6009F3276 /* Build configuration list for PBXProject "ConsoleDemo" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + E577670818334DF7009F3276 /* Debug */, + E577670918334DF7009F3276 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + E577670A18334DF7009F3276 /* Build configuration list for PBXNativeTarget "ConsoleDemo" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + E577670B18334DF7009F3276 /* Debug */, + E577670C18334DF7009F3276 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = E57766CD18334DF6009F3276 /* Project object */; +} diff --git a/Demo/ConsoleDemo.xcodeproj/xcshareddata/xcschemes/ConsoleDemo.xcscheme b/Demo/ConsoleDemo.xcodeproj/xcshareddata/xcschemes/ConsoleDemo.xcscheme index 28e7f89..6d81bb9 100644 --- a/Demo/ConsoleDemo.xcodeproj/xcshareddata/xcschemes/ConsoleDemo.xcscheme +++ b/Demo/ConsoleDemo.xcodeproj/xcshareddata/xcschemes/ConsoleDemo.xcscheme @@ -1,6 +1,6 @@ + shouldUseLaunchSchemeArgsEnv = "YES"> @@ -38,17 +38,21 @@ ReferencedContainer = "container:ConsoleDemo.xcodeproj"> + + - + - + \ No newline at end of file + + + + + + + diff --git a/Demo/ConsoleDemo/AppDelegate.m b/Demo/ConsoleDemo/AppDelegate.m index 52bb4f1..e841366 100644 --- a/Demo/ConsoleDemo/AppDelegate.m +++ b/Demo/ConsoleDemo/AppDelegate.m @@ -30,15 +30,6 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:( // Add the console dashboard for testing builds [PTEDashboard.sharedDashboard show]; -// PTEDashboard.sharedDashboard.windowLevel = UIWindowLevelNormal; -// PTEDashboard.sharedDashboard.windowLevel = UIWindowLevelNormal + 10; -// PTEDashboard.sharedDashboard.windowLevel = UIWindowLevelStatusBar + 1; -// [NSTimer scheduledTimerWithTimeInterval:0.1 target:self selector:@selector(adjust) userInfo:nil repeats:YES]; -// -// dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ -// PTEDashboard.sharedDashboard.windowLevel = UIWindowLevelStatusBar + 1; -// }); - DDLogInfo(@"Added console dashboard"); #endif diff --git a/Demo/ConsoleDemo/ConsoleDemo-Info.plist b/Demo/ConsoleDemo/ConsoleDemo-Info.plist index e088242..bb46122 100644 --- a/Demo/ConsoleDemo/ConsoleDemo-Info.plist +++ b/Demo/ConsoleDemo/ConsoleDemo-Info.plist @@ -9,7 +9,7 @@ CFBundleExecutable ${EXECUTABLE_NAME} CFBundleIdentifier - com.PTEz.${PRODUCT_NAME:rfc1034identifier} + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/Demo/ConsoleDemo/ConsoleDemo-Prefix.pch b/Demo/ConsoleDemo/ConsoleDemo-Prefix.pch index cf82a25..5eb3a34 100644 --- a/Demo/ConsoleDemo/ConsoleDemo-Prefix.pch +++ b/Demo/ConsoleDemo/ConsoleDemo-Prefix.pch @@ -14,4 +14,6 @@ #import #import #import + + #define ddLogLevel DDLogLevelVerbose #endif diff --git a/Demo/Podfile b/Demo/Podfile index 4a7fc16..545e35d 100644 --- a/Demo/Podfile +++ b/Demo/Podfile @@ -1,13 +1,15 @@ -platform :ios, '5.0' +platform :ios, '8.0' source 'https://github.com/CocoaPods/Specs.git' -# For regular projects -pod 'CocoaLumberjack' -#pod 'LumberjackConsole', :configurations => ['Debug'] +target 'ConsoleDemo' do + # For regular projects + pod 'CocoaLumberjack' + #pod 'LumberjackConsole', :configurations => ['Debug'] -# Optional for dynamic logging -#pod 'NBULog' + # Optional for dynamic logging + #pod 'NBULog' -# For development -pod 'LumberjackConsole', :path => '../' + # For development + pod 'LumberjackConsole', :path => '../' +end diff --git a/Demo/Podfile.lock b/Demo/Podfile.lock index 4bd49ff..26fb088 100644 --- a/Demo/Podfile.lock +++ b/Demo/Podfile.lock @@ -1,16 +1,14 @@ PODS: - - CocoaLumberjack (2.0.0): - - CocoaLumberjack/Default (= 2.0.0) - - CocoaLumberjack/Extensions (= 2.0.0) - - CocoaLumberjack/Core (2.0.0) - - CocoaLumberjack/Default (2.0.0): - - CocoaLumberjack/Core - - CocoaLumberjack/Extensions (2.0.0): + - CocoaLumberjack (3.2.0): + - CocoaLumberjack/Default (= 3.2.0) + - CocoaLumberjack/Extensions (= 3.2.0) + - CocoaLumberjack/Default (3.2.0) + - CocoaLumberjack/Extensions (3.2.0): - CocoaLumberjack/Default - - LumberjackConsole (2.4.3): - - CocoaLumberjack (>= 2.0.0) - - NBUCore (>= 2.0.3) - - NBUCore (2.0.4) + - LumberjackConsole (3.0.0): + - CocoaLumberjack (>= 3.x) + - NBUCore (>= 2.0.5) + - NBUCore (2.0.5) DEPENDENCIES: - CocoaLumberjack @@ -18,11 +16,13 @@ DEPENDENCIES: EXTERNAL SOURCES: LumberjackConsole: - :path: ../ + :path: "../" SPEC CHECKSUMS: - CocoaLumberjack: fd2b1031c6c4e0f08b5ea928ef677fa0a5de517d - LumberjackConsole: 81bad3312fea315b8a17e53926b014f032ec1f44 - NBUCore: 978f24fdc8d79dc8141032bf0121053e3b25c95c + CocoaLumberjack: 9b4aed7073d242f29cc2f62068d995faf67f703a + LumberjackConsole: e36ef0ed4fdcbe8caea3ec5b0e68d06db25e6fce + NBUCore: bfdce78c97f2a9566c97082f44157547223b22a6 -COCOAPODS: 0.36.0 +PODFILE CHECKSUM: 90a156a3e96d1859607737f390b7347a50d9ff34 + +COCOAPODS: 1.2.1 diff --git a/Demo/Pods/CocoaLumberjack/Classes/CocoaLumberjack.h b/Demo/Pods/CocoaLumberjack/Classes/CocoaLumberjack.h index 0b568fb..2273121 100644 --- a/Demo/Pods/CocoaLumberjack/Classes/CocoaLumberjack.h +++ b/Demo/Pods/CocoaLumberjack/Classes/CocoaLumberjack.h @@ -1,6 +1,6 @@ // Software License Agreement (BSD License) // -// Copyright (c) 2010-2015, Deusty, LLC +// Copyright (c) 2010-2016, Deusty, LLC // All rights reserved. // // Redistribution and use of this software in source and binary forms, @@ -78,4 +78,9 @@ #import "DDTTYLogger.h" #import "DDASLLogger.h" #import "DDFileLogger.h" +#import "DDOSLogger.h" +// CLI +#if __has_include("CLIColor.h") && TARGET_OS_OSX +#import "CLIColor.h" +#endif diff --git a/Demo/Pods/CocoaLumberjack/Classes/CocoaLumberjack.swift b/Demo/Pods/CocoaLumberjack/Classes/CocoaLumberjack.swift index 3c59e40..1262626 100644 --- a/Demo/Pods/CocoaLumberjack/Classes/CocoaLumberjack.swift +++ b/Demo/Pods/CocoaLumberjack/Classes/CocoaLumberjack.swift @@ -1,6 +1,6 @@ // Software License Agreement (BSD License) // -// Copyright (c) 2014-2015, Deusty, LLC +// Copyright (c) 2014-2016, Deusty, LLC // All rights reserved. // // Redistribution and use of this software in source and binary forms, @@ -14,78 +14,82 @@ // prior written permission of Deusty, LLC. import Foundation -import CocoaLumberjack extension DDLogFlag { - public static func fromLogLevel(logLevel: DDLogLevel) -> DDLogFlag { - return DDLogFlag(logLevel.rawValue) + public static func from(_ logLevel: DDLogLevel) -> DDLogFlag { + return DDLogFlag(rawValue: logLevel.rawValue) } + + public init(_ logLevel: DDLogLevel) { + self = DDLogFlag(rawValue: logLevel.rawValue) + } ///returns the log level, or the lowest equivalant. public func toLogLevel() -> DDLogLevel { - if let ourValid = DDLogLevel(rawValue: self.rawValue) { + if let ourValid = DDLogLevel(rawValue: rawValue) { return ourValid } else { - let logFlag = self - if logFlag & .Verbose == .Verbose { - return .Error - } else if logFlag & .Debug == .Debug { - return .Debug - } else if logFlag & .Info == .Info { - return .Info - } else if logFlag & .Warning == .Warning { - return .Warning - } else if logFlag & .Error == .Error { - return .Verbose + if contains(.verbose) { + return .verbose + } else if contains(.debug) { + return .debug + } else if contains(.info) { + return .info + } else if contains(.warning) { + return .warning + } else if contains(.error) { + return .error } else { - return .Off + return .off } } } } -extension DDMultiFormatter { - public var formatterArray: [DDLogFormatter] { - return self.formatters as [DDLogFormatter] - } -} - -public var defaultDebugLevel = DDLogLevel.Warning +public var defaultDebugLevel = DDLogLevel.verbose public func resetDefaultDebugLevel() { - defaultDebugLevel = DDLogLevel.Warning + defaultDebugLevel = DDLogLevel.verbose } -public func SwiftLogMacro(isAsynchronous: Bool, level: DDLogLevel, flag flg: DDLogFlag, context: Int = 0, file: StaticString = __FILE__, function: StaticString = __FUNCTION__, line: UInt = __LINE__, tag: AnyObject? = nil, #string: @autoclosure () -> String) { - if level.rawValue & flg.rawValue != 0 { - // Tell the DDLogMessage constructor to copy the C strings that get passed to it. Using string interpolation to prevent integer overflow warning when using StaticString.stringValue - let logMessage = DDLogMessage(message: string(), level: level, flag: flg, context: context, file: "\(file)", function: "\(function)", line: line, tag: tag, options: .CopyFile | .CopyFunction, timestamp: nil) - DDLog.log(isAsynchronous, message: logMessage) +public func _DDLogMessage(_ message: @autoclosure () -> String, level: DDLogLevel, flag: DDLogFlag, context: Int, file: StaticString, function: StaticString, line: UInt, tag: Any?, asynchronous: Bool, ddlog: DDLog) { + if level.rawValue & flag.rawValue != 0 { + // Tell the DDLogMessage constructor to copy the C strings that get passed to it. + let logMessage = DDLogMessage(message: message(), level: level, flag: flag, context: context, file: String(describing: file), function: String(describing: function), line: line, tag: tag, options: [.copyFile, .copyFunction], timestamp: nil) + ddlog.log(asynchronous: asynchronous, message: logMessage) } } -public func DDLogDebug(logText: @autoclosure () -> String, level: DDLogLevel = defaultDebugLevel, file: StaticString = __FILE__, function: StaticString = __FUNCTION__, line: UWord = __LINE__, asynchronous async: Bool = true) { - SwiftLogMacro(async, level, flag: .Debug, file: file, function: function, line: line, string: logText) +public func DDLogDebug(_ message: @autoclosure () -> String, level: DDLogLevel = defaultDebugLevel, context: Int = 0, file: StaticString = #file, function: StaticString = #function, line: UInt = #line, tag: Any? = nil, asynchronous async: Bool = true, ddlog: DDLog = DDLog.sharedInstance) { + _DDLogMessage(message, level: level, flag: .debug, context: context, file: file, function: function, line: line, tag: tag, asynchronous: async, ddlog: ddlog) } -public func DDLogInfo(logText: @autoclosure () -> String, level: DDLogLevel = defaultDebugLevel, file: StaticString = __FILE__, function: StaticString = __FUNCTION__, line: UWord = __LINE__, asynchronous async: Bool = true) { - SwiftLogMacro(async, level, flag: .Info, file: file, function: function, line: line, string: logText) +public func DDLogInfo(_ message: @autoclosure () -> String, level: DDLogLevel = defaultDebugLevel, context: Int = 0, file: StaticString = #file, function: StaticString = #function, line: UInt = #line, tag: Any? = nil, asynchronous async: Bool = true, ddlog: DDLog = DDLog.sharedInstance) { + _DDLogMessage(message, level: level, flag: .info, context: context, file: file, function: function, line: line, tag: tag, asynchronous: async, ddlog: ddlog) } -public func DDLogWarn(logText: @autoclosure () -> String, level: DDLogLevel = defaultDebugLevel, file: StaticString = __FILE__, function: StaticString = __FUNCTION__, line: UWord = __LINE__, asynchronous async: Bool = true) { - SwiftLogMacro(async, level, flag: .Warning, file: file, function: function, line: line, string: logText) +public func DDLogWarn(_ message: @autoclosure () -> String, level: DDLogLevel = defaultDebugLevel, context: Int = 0, file: StaticString = #file, function: StaticString = #function, line: UInt = #line, tag: Any? = nil, asynchronous async: Bool = true, ddlog: DDLog = DDLog.sharedInstance) { + _DDLogMessage(message, level: level, flag: .warning, context: context, file: file, function: function, line: line, tag: tag, asynchronous: async, ddlog: ddlog) } -public func DDLogVerbose(logText: @autoclosure () -> String, level: DDLogLevel = defaultDebugLevel, file: StaticString = __FILE__, function: StaticString = __FUNCTION__, line: UWord = __LINE__, asynchronous async: Bool = true) { - SwiftLogMacro(async, level, flag: .Verbose, file: file, function: function, line: line, string: logText) +public func DDLogVerbose(_ message: @autoclosure () -> String, level: DDLogLevel = defaultDebugLevel, context: Int = 0, file: StaticString = #file, function: StaticString = #function, line: UInt = #line, tag: Any? = nil, asynchronous async: Bool = true, ddlog: DDLog = DDLog.sharedInstance) { + _DDLogMessage(message, level: level, flag: .verbose, context: context, file: file, function: function, line: line, tag: tag, asynchronous: async, ddlog: ddlog) } -public func DDLogError(logText: @autoclosure () -> String, level: DDLogLevel = defaultDebugLevel, file: StaticString = __FILE__, function: StaticString = __FUNCTION__, line: UWord = __LINE__, asynchronous async: Bool = false) { - SwiftLogMacro(async, level, flag: .Error, file: file, function: function, line: line, string: logText) +public func DDLogError(_ message: @autoclosure () -> String, level: DDLogLevel = defaultDebugLevel, context: Int = 0, file: StaticString = #file, function: StaticString = #function, line: UInt = #line, tag: Any? = nil, asynchronous async: Bool = false, ddlog: DDLog = DDLog.sharedInstance) { + _DDLogMessage(message, level: level, flag: .error, context: context, file: file, function: function, line: line, tag: tag, asynchronous: async, ddlog: ddlog) } -/// Analogous to the C preprocessor macro THIS_FILE -public func CurrentFileName(fileName: StaticString = __FILE__) -> String { - // Using string interpolation to prevent integer overflow warning when using StaticString.stringValue - return "\(fileName)".lastPathComponent.stringByDeletingPathExtension +/// Returns a String of the current filename, without full path or extension. +/// +/// Analogous to the C preprocessor macro `THIS_FILE`. +public func CurrentFileName(_ fileName: StaticString = #file) -> String { + var str = String(describing: fileName) + if let idx = str.range(of: "/", options: .backwards)?.upperBound { + str = str.substring(from: idx) + } + if let idx = str.range(of: ".", options: .backwards)?.lowerBound { + str = str.substring(to: idx) + } + return str } diff --git a/Demo/Pods/CocoaLumberjack/Classes/DDASLLogCapture.h b/Demo/Pods/CocoaLumberjack/Classes/DDASLLogCapture.h index c87d0b1..64d8370 100644 --- a/Demo/Pods/CocoaLumberjack/Classes/DDASLLogCapture.h +++ b/Demo/Pods/CocoaLumberjack/Classes/DDASLLogCapture.h @@ -1,6 +1,6 @@ // Software License Agreement (BSD License) // -// Copyright (c) 2010-2015, Deusty, LLC +// Copyright (c) 2010-2016, Deusty, LLC // All rights reserved. // // Redistribution and use of this software in source and binary forms, @@ -22,11 +22,20 @@ */ @interface DDASLLogCapture : NSObject +/** + * Start capturing logs + */ + (void)start; + +/** + * Stop capturing logs + */ + (void)stop; -// Default log level: DDLogLevelVerbose (i.e. capture all ASL messages). -+ (DDLogLevel)captureLevel; -+ (void)setCaptureLevel:(DDLogLevel)level; +/** + * The current capture level. + * @note Default log level: DDLogLevelVerbose (i.e. capture all ASL messages). + */ +@property (class) DDLogLevel captureLevel; @end diff --git a/Demo/Pods/CocoaLumberjack/Classes/DDASLLogCapture.m b/Demo/Pods/CocoaLumberjack/Classes/DDASLLogCapture.m index 87601a3..4341d6d 100644 --- a/Demo/Pods/CocoaLumberjack/Classes/DDASLLogCapture.m +++ b/Demo/Pods/CocoaLumberjack/Classes/DDASLLogCapture.m @@ -1,6 +1,6 @@ // Software License Agreement (BSD License) // -// Copyright (c) 2010-2015, Deusty, LLC +// Copyright (c) 2010-2016, Deusty, LLC // All rights reserved. // // Redistribution and use of this software in source and binary forms, @@ -73,7 +73,7 @@ + (void)start { _cancel = NO; dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^(void) { - [DDASLLogCapture captureAslLogs]; + [self captureAslLogs]; }); } @@ -95,8 +95,11 @@ + (void)configureAslQuery:(aslmsg)query { const char param[] = "7"; // ASL_LEVEL_DEBUG, which is everything. We'll rely on regular DDlog log level to filter asl_set_query(query, ASL_KEY_LEVEL, param, ASL_QUERY_OP_LESS_EQUAL | ASL_QUERY_OP_NUMERIC); + + // Don't retrieve logs from our own DDASLLogger + asl_set_query(query, kDDASLKeyDDLog, kDDASLDDLogValue, ASL_QUERY_OP_NOT_EQUAL); -#if !TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR +#if !TARGET_OS_IPHONE || TARGET_SIMULATOR int processId = [[NSProcessInfo processInfo] processIdentifier]; char pid[16]; sprintf(pid, "%d", processId); @@ -104,27 +107,16 @@ + (void)configureAslQuery:(aslmsg)query { #endif } -+ (void)aslMessageRecieved:(aslmsg)msg { ++ (void)aslMessageReceived:(aslmsg)msg { const char* messageCString = asl_get( msg, ASL_KEY_MSG ); if ( messageCString == NULL ) return; - - // NSString * sender = [NSString stringWithCString:asl_get(msg, ASL_KEY_SENDER) encoding:NSUTF8StringEncoding]; - NSString *message = @(messageCString); - NSString *level = @(asl_get(msg, ASL_KEY_LEVEL)); - NSString *secondsStr = @(asl_get(msg, ASL_KEY_TIME)); - NSString *nanoStr = @(asl_get(msg, ASL_KEY_TIME_NSEC)); - - NSTimeInterval seconds = [secondsStr doubleValue]; - NSTimeInterval nanoSeconds = [nanoStr doubleValue]; - NSTimeInterval totalSeconds = seconds + (nanoSeconds / 1e9); - - NSDate *timeStamp = [NSDate dateWithTimeIntervalSince1970:totalSeconds]; int flag; BOOL async; - switch ([level intValue]) { + const char* levelCString = asl_get(msg, ASL_KEY_LEVEL); + switch (levelCString? atoi(levelCString) : 0) { // By default all NSLog's with a ASL_LEVEL_WARNING level case ASL_LEVEL_EMERG : case ASL_LEVEL_ALERT : @@ -136,11 +128,22 @@ + (void)aslMessageRecieved:(aslmsg)msg { case ASL_LEVEL_DEBUG : default : flag = DDLogFlagVerbose; async = YES; break; } - + if (!(_captureLevel & flag)) { return; } - + + // NSString * sender = [NSString stringWithCString:asl_get(msg, ASL_KEY_SENDER) encoding:NSUTF8StringEncoding]; + NSString *message = @(messageCString); + + const char* secondsCString = asl_get( msg, ASL_KEY_TIME ); + const char* nanoCString = asl_get( msg, ASL_KEY_TIME_NSEC ); + NSTimeInterval seconds = secondsCString ? strtod(secondsCString, NULL) : [NSDate timeIntervalSinceReferenceDate] - NSTimeIntervalSince1970; + double nanoSeconds = nanoCString? strtod(nanoCString, NULL) : 0; + NSTimeInterval totalSeconds = seconds + (nanoSeconds / 1e9); + + NSDate *timeStamp = [NSDate dateWithTimeIntervalSince1970:totalSeconds]; + DDLogMessage *logMessage = [[DDLogMessage alloc]initWithMessage:message level:_captureLevel flag:flag @@ -198,7 +201,7 @@ syslogd posts kNotifyASLDBUpdate (com.apple.system.logger.message) asl_set_query(query, ASL_KEY_TIME, stringValue, ASL_QUERY_OP_GREATER_EQUAL | ASL_QUERY_OP_NUMERIC); } - [DDASLLogCapture configureAslQuery:query]; + [self configureAslQuery:query]; // Iterate over new messages. aslmsg msg; @@ -206,19 +209,19 @@ syslogd posts kNotifyASLDBUpdate (com.apple.system.logger.message) while ((msg = dd_asl_next(response))) { - [DDASLLogCapture aslMessageRecieved:msg]; + [self aslMessageReceived:msg]; // Keep track of which messages we've seen. lastSeenID = atoll(asl_get(msg, ASL_KEY_MSG_ID)); } dd_asl_release(response); - + asl_free(query); + if (_cancel) { - notify_cancel(notifyToken); + notify_cancel(token); return; } - free(query); } }); } diff --git a/Demo/Pods/CocoaLumberjack/Classes/DDASLLogger.h b/Demo/Pods/CocoaLumberjack/Classes/DDASLLogger.h old mode 100755 new mode 100644 index 5ca6785..046636d --- a/Demo/Pods/CocoaLumberjack/Classes/DDASLLogger.h +++ b/Demo/Pods/CocoaLumberjack/Classes/DDASLLogger.h @@ -1,6 +1,6 @@ // Software License Agreement (BSD License) // -// Copyright (c) 2010-2015, Deusty, LLC +// Copyright (c) 2010-2016, Deusty, LLC // All rights reserved. // // Redistribution and use of this software in source and binary forms, @@ -22,11 +22,17 @@ #import "DDLog.h" +// Custom key set on messages sent to ASL +extern const char* const kDDASLKeyDDLog; + +// Value set for kDDASLKeyDDLog +extern const char* const kDDASLDDLogValue; + /** * This class provides a logger for the Apple System Log facility. * * As described in the "Getting Started" page, - * the traditional NSLog() function directs it's output to two places: + * the traditional NSLog() function directs its output to two places: * * - Apple System Log * - StdErr (if stderr is a TTY) so log statements show up in Xcode console @@ -35,10 +41,14 @@ * However, if you instead choose to use file logging (for faster performance), * you may choose to use a file logger and a tty logger. **/ - @interface DDASLLogger : DDAbstractLogger -+ (instancetype)sharedInstance; +/** + * Singleton method + * + * @return the shared instance + */ +@property (class, readonly, strong) DDASLLogger *sharedInstance; // Inherited from DDAbstractLogger diff --git a/Demo/Pods/CocoaLumberjack/Classes/DDASLLogger.m b/Demo/Pods/CocoaLumberjack/Classes/DDASLLogger.m index c3a2c18..61c1172 100644 --- a/Demo/Pods/CocoaLumberjack/Classes/DDASLLogger.m +++ b/Demo/Pods/CocoaLumberjack/Classes/DDASLLogger.m @@ -1,6 +1,6 @@ // Software License Agreement (BSD License) // -// Copyright (c) 2010-2015, Deusty, LLC +// Copyright (c) 2010-2016, Deusty, LLC // All rights reserved. // // Redistribution and use of this software in source and binary forms, @@ -20,6 +20,10 @@ #error This file must be compiled with ARC. Use -fobjc-arc flag (or convert project to ARC). #endif +const char* const kDDASLKeyDDLog = "DDLog"; + +const char* const kDDASLDDLogValue = "1"; + static DDASLLogger *sharedInstance; @interface DDASLLogger () { @@ -64,7 +68,7 @@ - (void)logMessage:(DDLogMessage *)logMessage { NSString * message = _logFormatter ? [_logFormatter formatLogMessage:logMessage] : logMessage->_message; - if (logMessage) { + if (message) { const char *msg = [message UTF8String]; size_t aslLogLevel; @@ -86,7 +90,7 @@ - (void)logMessage:(DDLogMessage *)logMessage { char readUIDString[16]; #ifndef NS_BLOCK_ASSERTIONS - int l = snprintf(readUIDString, sizeof(readUIDString), "%d", readUID); + size_t l = snprintf(readUIDString, sizeof(readUIDString), "%d", readUID); #else snprintf(readUIDString, sizeof(readUIDString), "%d", readUID); #endif @@ -100,7 +104,8 @@ - (void)logMessage:(DDLogMessage *)logMessage { if (m != NULL) { if (asl_set(m, ASL_KEY_LEVEL, level_strings[aslLogLevel]) == 0 && asl_set(m, ASL_KEY_MSG, msg) == 0 && - asl_set(m, ASL_KEY_READ_UID, readUIDString) == 0) { + asl_set(m, ASL_KEY_READ_UID, readUIDString) == 0 && + asl_set(m, kDDASLKeyDDLog, kDDASLDDLogValue) == 0) { asl_send(_client, m); } asl_free(m); diff --git a/Demo/Pods/CocoaLumberjack/Classes/DDAbstractDatabaseLogger.h b/Demo/Pods/CocoaLumberjack/Classes/DDAbstractDatabaseLogger.h index 745a91b..208bb22 100644 --- a/Demo/Pods/CocoaLumberjack/Classes/DDAbstractDatabaseLogger.h +++ b/Demo/Pods/CocoaLumberjack/Classes/DDAbstractDatabaseLogger.h @@ -1,6 +1,6 @@ // Software License Agreement (BSD License) // -// Copyright (c) 2010-2015, Deusty, LLC +// Copyright (c) 2010-2016, Deusty, LLC // All rights reserved. // // Redistribution and use of this software in source and binary forms, @@ -27,7 +27,6 @@ * All that is needed for a concrete database logger is to extend this class * and override the methods in the implementation file that are prefixed with "db_". **/ - @interface DDAbstractDatabaseLogger : DDAbstractLogger { @protected @@ -67,6 +66,10 @@ * The default saveInterval is 60 seconds. **/ @property (assign, readwrite) NSUInteger saveThreshold; + +/** + * See the description for the `saveThreshold` property + */ @property (assign, readwrite) NSTimeInterval saveInterval; /** @@ -96,7 +99,15 @@ * The default deleteOnEverySave is NO. **/ @property (assign, readwrite) NSTimeInterval maxAge; + +/** + * See the description for the `maxAge` property + */ @property (assign, readwrite) NSTimeInterval deleteInterval; + +/** + * See the description for the `maxAge` property + */ @property (assign, readwrite) BOOL deleteOnEverySave; /** diff --git a/Demo/Pods/CocoaLumberjack/Classes/DDAbstractDatabaseLogger.m b/Demo/Pods/CocoaLumberjack/Classes/DDAbstractDatabaseLogger.m index c8782de..af37bdb 100644 --- a/Demo/Pods/CocoaLumberjack/Classes/DDAbstractDatabaseLogger.m +++ b/Demo/Pods/CocoaLumberjack/Classes/DDAbstractDatabaseLogger.m @@ -1,6 +1,6 @@ // Software License Agreement (BSD License) // -// Copyright (c) 2010-2015, Deusty, LLC +// Copyright (c) 2010-2016, Deusty, LLC // All rights reserved. // // Redistribution and use of this software in source and binary forms, @@ -126,10 +126,10 @@ - (void)destroySaveTimer { - (void)updateAndResumeSaveTimer { if ((_saveTimer != NULL) && (_saveInterval > 0.0) && (_unsavedTime > 0.0)) { - uint64_t interval = (uint64_t)(_saveInterval * NSEC_PER_SEC); + uint64_t interval = (uint64_t)(_saveInterval * (NSTimeInterval) NSEC_PER_SEC); dispatch_time_t startTime = dispatch_time(_unsavedTime, interval); - dispatch_source_set_timer(_saveTimer, startTime, interval, 1.0); + dispatch_source_set_timer(_saveTimer, startTime, interval, 1ull * NSEC_PER_SEC); if (_saveTimerSuspended) { dispatch_resume(_saveTimer); @@ -162,7 +162,7 @@ - (void)destroyDeleteTimer { - (void)updateDeleteTimer { if ((_deleteTimer != NULL) && (_deleteInterval > 0.0) && (_maxAge > 0.0)) { - uint64_t interval = (uint64_t)(_deleteInterval * NSEC_PER_SEC); + uint64_t interval = (uint64_t)(_deleteInterval * (NSTimeInterval) NSEC_PER_SEC); dispatch_time_t startTime; if (_lastDeleteTime > 0) { @@ -171,7 +171,7 @@ - (void)updateDeleteTimer { startTime = dispatch_time(DISPATCH_TIME_NOW, interval); } - dispatch_source_set_timer(_deleteTimer, startTime, interval, 1.0); + dispatch_source_set_timer(_deleteTimer, startTime, interval, 1ull * NSEC_PER_SEC); } } diff --git a/Demo/Pods/CocoaLumberjack/Classes/DDAssertMacros.h b/Demo/Pods/CocoaLumberjack/Classes/DDAssertMacros.h index 870d31f..7678a9c 100644 --- a/Demo/Pods/CocoaLumberjack/Classes/DDAssertMacros.h +++ b/Demo/Pods/CocoaLumberjack/Classes/DDAssertMacros.h @@ -1,6 +1,6 @@ // Software License Agreement (BSD License) // -// Copyright (c) 2010-2015, Deusty, LLC +// Copyright (c) 2010-2016, Deusty, LLC // All rights reserved. // // Redistribution and use of this software in source and binary forms, diff --git a/Demo/Pods/CocoaLumberjack/Classes/DDFileLogger.h b/Demo/Pods/CocoaLumberjack/Classes/DDFileLogger.h index d2f9ebb..22970aa 100644 --- a/Demo/Pods/CocoaLumberjack/Classes/DDFileLogger.h +++ b/Demo/Pods/CocoaLumberjack/Classes/DDFileLogger.h @@ -1,6 +1,6 @@ // Software License Agreement (BSD License) // -// Copyright (c) 2010-2015, Deusty, LLC +// Copyright (c) 2010-2016, Deusty, LLC // All rights reserved. // // Redistribution and use of this software in source and binary forms, @@ -46,28 +46,29 @@ extern unsigned long long const kDDDefaultLogFilesDiskQuota; #pragma mark - //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -// The LogFileManager protocol is designed to allow you to control all aspects of your log files. -// -// The primary purpose of this is to allow you to do something with the log files after they have been rolled. -// Perhaps you want to compress them to save disk space. -// Perhaps you want to upload them to an FTP server. -// Perhaps you want to run some analytics on the file. -// -// A default LogFileManager is, of course, provided. -// The default LogFileManager simply deletes old log files according to the maximumNumberOfLogFiles property. -// -// This protocol provides various methods to fetch the list of log files. -// -// There are two variants: sorted and unsorted. -// If sorting is not necessary, the unsorted variant is obviously faster. -// The sorted variant will return an array sorted by when the log files were created, -// with the most recently created log file at index 0, and the oldest log file at the end of the array. -// -// You can fetch only the log file paths (full path including name), log file names (name only), -// or an array of DDLogFileInfo objects. -// The DDLogFileInfo class is documented below, and provides a handy wrapper that -// gives you easy access to various file attributes such as the creation date or the file size. - +/** + * The LogFileManager protocol is designed to allow you to control all aspects of your log files. + * + * The primary purpose of this is to allow you to do something with the log files after they have been rolled. + * Perhaps you want to compress them to save disk space. + * Perhaps you want to upload them to an FTP server. + * Perhaps you want to run some analytics on the file. + * + * A default LogFileManager is, of course, provided. + * The default LogFileManager simply deletes old log files according to the maximumNumberOfLogFiles property. + * + * This protocol provides various methods to fetch the list of log files. + * + * There are two variants: sorted and unsorted. + * If sorting is not necessary, the unsorted variant is obviously faster. + * The sorted variant will return an array sorted by when the log files were created, + * with the most recently created log file at index 0, and the oldest log file at the end of the array. + * + * You can fetch only the log file paths (full path including name), log file names (name only), + * or an array of `DDLogFileInfo` objects. + * The `DDLogFileInfo` class is documented below, and provides a handy wrapper that + * gives you easy access to various file attributes such as the creation date or the file size. + */ @protocol DDLogFileManager @required @@ -93,26 +94,71 @@ extern unsigned long long const kDDDefaultLogFilesDiskQuota; // Public methods -- (NSString *)logsDirectory; +/** + * Returns the logs directory (path) + */ +@property (nonatomic, readonly, copy) NSString *logsDirectory; + +/** + * Returns an array of `NSString` objects, + * each of which is the filePath to an existing log file on disk. + **/ +@property (nonatomic, readonly, strong) NSArray *unsortedLogFilePaths; + +/** + * Returns an array of `NSString` objects, + * each of which is the fileName of an existing log file on disk. + **/ +@property (nonatomic, readonly, strong) NSArray *unsortedLogFileNames; + +/** + * Returns an array of `DDLogFileInfo` objects, + * each representing an existing log file on disk, + * and containing important information about the log file such as it's modification date and size. + **/ +@property (nonatomic, readonly, strong) NSArray *unsortedLogFileInfos; -- (NSArray *)unsortedLogFilePaths; -- (NSArray *)unsortedLogFileNames; -- (NSArray *)unsortedLogFileInfos; +/** + * Just like the `unsortedLogFilePaths` method, but sorts the array. + * The items in the array are sorted by creation date. + * The first item in the array will be the most recently created log file. + **/ +@property (nonatomic, readonly, strong) NSArray *sortedLogFilePaths; -- (NSArray *)sortedLogFilePaths; -- (NSArray *)sortedLogFileNames; -- (NSArray *)sortedLogFileInfos; +/** + * Just like the `unsortedLogFileNames` method, but sorts the array. + * The items in the array are sorted by creation date. + * The first item in the array will be the most recently created log file. + **/ +@property (nonatomic, readonly, strong) NSArray *sortedLogFileNames; + +/** + * Just like the `unsortedLogFileInfos` method, but sorts the array. + * The items in the array are sorted by creation date. + * The first item in the array will be the most recently created log file. + **/ +@property (nonatomic, readonly, strong) NSArray *sortedLogFileInfos; // Private methods (only to be used by DDFileLogger) +/** + * Generates a new unique log file path, and creates the corresponding log file. + **/ - (NSString *)createNewLogFile; @optional // Notifications from DDFileLogger -- (void)didArchiveLogFile:(NSString *)logFilePath; -- (void)didRollAndArchiveLogFile:(NSString *)logFilePath; +/** + * Called when a log file was archieved + */ +- (void)didArchiveLogFile:(NSString *)logFilePath NS_SWIFT_NAME(didArchiveLogFile(atPath:)); + +/** + * Called when the roll action was executed and the log was archieved + */ +- (void)didRollAndArchiveLogFile:(NSString *)logFilePath NS_SWIFT_NAME(didRollAndArchiveLogFile(atPath:)); @end @@ -125,18 +171,26 @@ extern unsigned long long const kDDDefaultLogFilesDiskQuota; * * All log files are placed inside the logsDirectory. * If a specific logsDirectory isn't specified, the default directory is used. - * On Mac, this is in ~/Library/Logs/. - * On iPhone, this is in ~/Library/Caches/Logs. + * On Mac, this is in `~/Library/Logs/`. + * On iPhone, this is in `~/Library/Caches/Logs`. * - * Log files are named "