Skip to content

Updated to SwiftyBeaver 1.9.1 & Xcode 11.5 #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bsweett wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Updated to SwiftyBeaver 1.9.1 & Xcode 11.5 #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f1025b1
Updated to SwiftyBeaver 1.9.1
bsweett Jun 5, 2020
b0159e5
Updated dependency
bsweett Jun 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cartfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "SwiftyBeaver/SwiftyBeaver" ~> 1.7.0
github "SwiftyBeaver/SwiftyBeaver" ~> 1.9.1
2 changes: 1 addition & 1 deletion Example-iOS/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion SBObjectiveCWrapper.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
29 changes: 22 additions & 7 deletions SBObjectiveCWrapper.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0720;
LastUpgradeCheck = 0800;
LastUpgradeCheck = 1150;
ORGANIZATIONNAME = "Reese McLean";
TargetAttributes = {
389EA9951C2BB6C6005019A0 = {
Expand All @@ -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,
);
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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 = "";
Expand All @@ -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;
Expand All @@ -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";
Expand All @@ -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;
Expand All @@ -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;
Expand Down
6 changes: 1 addition & 5 deletions SBObjectiveCWrapper.xcodeproj/xcshareddata/xcschemes/SBObjectiveCWrapper (OSX).xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0800"
LastUpgradeVersion = "1150"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down Expand Up @@ -29,8 +29,6 @@
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
Expand All @@ -51,8 +49,6 @@
ReferencedContainer = "container:SBObjectiveCWrapper.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
Expand Down
24 changes: 10 additions & 14 deletions SBObjectiveCWrapper.xcodeproj/xcshareddata/xcschemes/SBObjectiveCWrapper (iOS).xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0800"
LastUpgradeVersion = "1150"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand All @@ -27,6 +27,15 @@
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "38A1347A1C28F22900E1B4A9"
BuildableName = "SBObjectiveCWrapper.framework"
BlueprintName = "SBObjectiveCWrapper (iOS)"
ReferencedContainer = "container:SBObjectiveCWrapper.xcodeproj">
</BuildableReference>
</MacroExpansion>
<Testables>
<TestableReference
skipped = "NO">
Expand All @@ -39,17 +48,6 @@
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "38A1347A1C28F22900E1B4A9"
BuildableName = "SBObjectiveCWrapper.framework"
BlueprintName = "SBObjectiveCWrapper (iOS)"
ReferencedContainer = "container:SBObjectiveCWrapper.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
Expand All @@ -70,8 +68,6 @@
ReferencedContainer = "container:SBObjectiveCWrapper.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
Expand Down
6 changes: 1 addition & 5 deletions SBObjectiveCWrapper.xcodeproj/xcshareddata/xcschemes/SBObjectiveCWrapper (tvOS).xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0800"
LastUpgradeVersion = "1150"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down Expand Up @@ -29,8 +29,6 @@
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
Expand All @@ -51,8 +49,6 @@
ReferencedContainer = "container:SBObjectiveCWrapper.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
Expand Down
6 changes: 1 addition & 5 deletions SBObjectiveCWrapper.xcodeproj/xcshareddata/xcschemes/SBObjectiveCWrapper (watchOS).xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0800"
LastUpgradeVersion = "1150"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down Expand Up @@ -29,8 +29,6 @@
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
Expand All @@ -51,8 +49,6 @@
ReferencedContainer = "container:SBObjectiveCWrapper.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
Expand Down
4 changes: 2 additions & 2 deletions SBObjectiveCWrapperTests/TestLogger.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ class Log: NSObject {
}
}

class TestLogger: NSObject, Loggable {
@objc class TestLogger: NSObject, Loggable {

static var lastLog: Log?
@objc static var lastLog: Log?

static func verbose(_ msg: @autoclosure () -> Any, _ path: String, _ function: String, line: Int, context: Any?) {
lastLog = Log(level: .Verbose, message: String(describing: msg()), path: path, function: function, line: line)
Expand Down
2 changes: 1 addition & 1 deletion lib/SwiftyBeaver
Open in desktop
Submodule SwiftyBeaver updated 32 files
+2 −0 .gitignore
+76 −1 CHANGELOG.md
+1 −1 Dockerfile
+1 −1 Info.plist
+13 −5 Package.swift
+53 −14 README.md
+42 −118 Sources/AES256CBC.swift
+40 −110 Sources/BaseDestination.swift
+4 −5 Sources/Extensions.swift
+71 −42 Sources/FileDestination.swift
+6 −7 Sources/Filter.swift
+129 −0 Sources/FilterValidator.swift
+9 −5 Sources/SBPlatformDestination.swift
+4 −8 Sources/SwiftyBeaver.swift
+5 −4 SwiftyBeaver.podspec
+25 −0 SwiftyBeaver.xcodeproj/SwiftyBeaverTests_Info.plist
+326 −682 SwiftyBeaver.xcodeproj/project.pbxproj
+2 −2 SwiftyBeaver.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+8 −0 SwiftyBeaver.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
+0 −99 SwiftyBeaver.xcodeproj/xcshareddata/xcschemes/SwiftyBeaver (iOS).xcscheme
+0 −80 SwiftyBeaver.xcodeproj/xcshareddata/xcschemes/SwiftyBeaver (macOS).xcscheme
+0 −80 SwiftyBeaver.xcodeproj/xcshareddata/xcschemes/SwiftyBeaver (watchOS).xcscheme
+13 −25 SwiftyBeaver.xcodeproj/xcshareddata/xcschemes/SwiftyBeaver-Package.xcscheme
+0 −24 Tests/Info.plist
+42 −10 Tests/SwiftyBeaverTests/BaseDestinationTests.swift
+5 −0 Tests/SwiftyBeaverTests/DestinationSetTests.swift
+36 −0 Tests/SwiftyBeaverTests/FileDestinationTests.swift
+4 −4 Tests/SwiftyBeaverTests/FilterTests.swift
+1 −1 Tests/SwiftyBeaverTests/GoogleCloudDestinationTests.swift
+13 −13 Tests/SwiftyBeaverTests/SBPlatformDestinationTests.swift
+67 −6 Tests/SwiftyBeaverTests/SwiftyBeaverTests.swift
+3 −3 test_in_docker.sh