diff --git a/Cartfile b/Cartfile index 6d8859e..bdcec38 100644 --- a/Cartfile +++ b/Cartfile @@ -1 +1 @@ -github "SwiftyBeaver/SwiftyBeaver" ~> 1.7.0 +github "SwiftyBeaver/SwiftyBeaver" ~> 1.9.1 diff --git a/Example-iOS/AppDelegate.swift b/Example-iOS/AppDelegate.swift index 7ecec9f..76dbe84 100644 --- a/Example-iOS/AppDelegate.swift +++ b/Example-iOS/AppDelegate.swift @@ -16,7 +16,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate { var window: UIWindow? - func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool { + func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool { let consoleDestination = ConsoleDestination() consoleDestination.minLevel = .warning diff --git a/SBObjectiveCWrapper.podspec b/SBObjectiveCWrapper.podspec index f214e8a..bff15bc 100644 --- a/SBObjectiveCWrapper.podspec +++ b/SBObjectiveCWrapper.podspec @@ -16,5 +16,5 @@ Pod::Spec.new do |s| s.osx.deployment_target = "10.11" s.source = { :git => "https://github.com/SwiftyBeaver/SBObjectiveCWrapper.git", :tag => s.version.to_s } s.source_files = "sources" - s.dependency 'SwiftyBeaver', '~> 1.7.0' + s.dependency 'SwiftyBeaver', '~> 1.9.1' end diff --git a/SBObjectiveCWrapper.xcodeproj/project.pbxproj b/SBObjectiveCWrapper.xcodeproj/project.pbxproj index dfbacf4..3c3126a 100644 --- a/SBObjectiveCWrapper.xcodeproj/project.pbxproj +++ b/SBObjectiveCWrapper.xcodeproj/project.pbxproj @@ -393,7 +393,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0720; - LastUpgradeCheck = 0800; + LastUpgradeCheck = 1150; ORGANIZATIONNAME = "Reese McLean"; TargetAttributes = { 389EA9951C2BB6C6005019A0 = { @@ -420,10 +420,9 @@ }; buildConfigurationList = 38A134751C28F22900E1B4A9 /* Build configuration list for PBXProject "SBObjectiveCWrapper" */; compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( - English, en, Base, ); @@ -612,14 +611,22 @@ CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = 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_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; @@ -650,7 +657,7 @@ PRODUCT_NAME = ""; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; @@ -665,14 +672,22 @@ CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = 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_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; @@ -696,7 +711,7 @@ PRODUCT_NAME = ""; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; @@ -709,7 +724,7 @@ buildSettings = { APPLICATION_EXTENSION_API_ONLY = NO; CLANG_ENABLE_MODULES = YES; - CODE_SIGN_IDENTITY = "iPhone Developer"; + CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; @@ -732,7 +747,7 @@ buildSettings = { APPLICATION_EXTENSION_API_ONLY = NO; CLANG_ENABLE_MODULES = YES; - CODE_SIGN_IDENTITY = "iPhone Developer"; + CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; diff --git a/SBObjectiveCWrapper.xcodeproj/xcshareddata/xcschemes/SBObjectiveCWrapper (OSX).xcscheme b/SBObjectiveCWrapper.xcodeproj/xcshareddata/xcschemes/SBObjectiveCWrapper (OSX).xcscheme index 56bd824..0adc4b7 100644 --- a/SBObjectiveCWrapper.xcodeproj/xcshareddata/xcschemes/SBObjectiveCWrapper (OSX).xcscheme +++ b/SBObjectiveCWrapper.xcodeproj/xcshareddata/xcschemes/SBObjectiveCWrapper (OSX).xcscheme @@ -1,6 +1,6 @@ - - - - + + + + @@ -39,17 +48,6 @@ - - - - - - - - - - - - - - - - Any, _ path: String, _ function: String, line: Int, context: Any?) { lastLog = Log(level: .Verbose, message: String(describing: msg()), path: path, function: function, line: line) diff --git a/lib/SwiftyBeaver b/lib/SwiftyBeaver index ad66cc4..e0fb3a7 160000 --- a/lib/SwiftyBeaver +++ b/lib/SwiftyBeaver @@ -1 +1 @@ -Subproject commit ad66cc41c5d8acbd63d9dcdc9d3609f152e08ed1 +Subproject commit e0fb3a74cb993d7dcf1e56734cdc98ad6e6d8176