Skip to content

Commit fc0f6a4

Browse files
sebastianvarelasebastianvarela
committed
Minor fixes
1 parent ca323cb commit fc0f6a4

6 files changed

Lines changed: 56 additions & 62 deletions

File tree

‎PrettyLogger.xcodeproj/project.pbxproj‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 50;
6+
objectVersion = 54;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -369,7 +369,7 @@
369369
isa = PBXProject;
370370
attributes = {
371371
LastSwiftUpdateCheck = 1010;
372-
LastUpgradeCheck = 1010;
372+
LastUpgradeCheck = 1420;
373373
ORGANIZATIONNAME = S3BA;
374374
TargetAttributes = {
375375
F2B655EB21E61459001B14A2 = {
@@ -478,6 +478,7 @@
478478
/* Begin PBXShellScriptBuildPhase section */
479479
F2B6567221E6937C001B14A2 /* SwiftLint */ = {
480480
isa = PBXShellScriptBuildPhase;
481+
alwaysOutOfDate = 1;
481482
buildActionMask = 2147483647;
482483
files = (
483484
);
@@ -496,6 +497,7 @@
496497
};
497498
F2B6567321E6939D001B14A2 /* SwiftLint */ = {
498499
isa = PBXShellScriptBuildPhase;
500+
alwaysOutOfDate = 1;
499501
buildActionMask = 2147483647;
500502
files = (
501503
);
@@ -514,6 +516,7 @@
514516
};
515517
F2B6567421E693AC001B14A2 /* SwiftLint */ = {
516518
isa = PBXShellScriptBuildPhase;
519+
alwaysOutOfDate = 1;
517520
buildActionMask = 2147483647;
518521
files = (
519522
);
@@ -532,6 +535,7 @@
532535
};
533536
F2B6567521E693BE001B14A2 /* SwiftLint */ = {
534537
isa = PBXShellScriptBuildPhase;
538+
alwaysOutOfDate = 1;
535539
buildActionMask = 2147483647;
536540
files = (
537541
);
@@ -654,6 +658,7 @@
654658
isa = XCBuildConfiguration;
655659
buildSettings = {
656660
ALWAYS_SEARCH_USER_PATHS = NO;
661+
APPLICATION_EXTENSION_API_ONLY = YES;
657662
CLANG_ANALYZER_NONNULL = YES;
658663
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
659664
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
@@ -676,6 +681,7 @@
676681
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
677682
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
678683
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
684+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
679685
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
680686
CLANG_WARN_STRICT_PROTOTYPES = YES;
681687
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -720,6 +726,7 @@
720726
isa = XCBuildConfiguration;
721727
buildSettings = {
722728
ALWAYS_SEARCH_USER_PATHS = NO;
729+
APPLICATION_EXTENSION_API_ONLY = YES;
723730
CLANG_ANALYZER_NONNULL = YES;
724731
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
725732
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
@@ -742,6 +749,7 @@
742749
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
743750
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
744751
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
752+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
745753
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
746754
CLANG_WARN_STRICT_PROTOTYPES = YES;
747755
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -862,7 +870,6 @@
862870
F2B6561121E615CC001B14A2 /* Debug */ = {
863871
isa = XCBuildConfiguration;
864872
buildSettings = {
865-
APPLICATION_EXTENSION_API_ONLY = YES;
866873
CLANG_ENABLE_MODULES = YES;
867874
CODE_SIGN_IDENTITY = "";
868875
CODE_SIGN_STYLE = Automatic;
@@ -890,7 +897,6 @@
890897
F2B6561221E615CC001B14A2 /* Release */ = {
891898
isa = XCBuildConfiguration;
892899
buildSettings = {
893-
APPLICATION_EXTENSION_API_ONLY = YES;
894900
CLANG_ENABLE_MODULES = YES;
895901
CODE_SIGN_IDENTITY = "";
896902
CODE_SIGN_STYLE = Automatic;
@@ -937,7 +943,7 @@
937943
SKIP_INSTALL = YES;
938944
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
939945
TARGETED_DEVICE_FAMILY = 3;
940-
TVOS_DEPLOYMENT_TARGET = 10.1;
946+
TVOS_DEPLOYMENT_TARGET = 12.0;
941947
};
942948
name = Debug;
943949
};
@@ -963,7 +969,7 @@
963969
SDKROOT = appletvos;
964970
SKIP_INSTALL = YES;
965971
TARGETED_DEVICE_FAMILY = 3;
966-
TVOS_DEPLOYMENT_TARGET = 10.1;
972+
TVOS_DEPLOYMENT_TARGET = 12.0;
967973
};
968974
name = Release;
969975
};
@@ -1012,6 +1018,7 @@
10121018
CODE_SIGN_IDENTITY = "-";
10131019
CODE_SIGN_STYLE = Automatic;
10141020
COMBINE_HIDPI_IMAGES = YES;
1021+
DEAD_CODE_STRIPPING = YES;
10151022
DEFINES_MODULE = YES;
10161023
DYLIB_COMPATIBILITY_VERSION = 1;
10171024
DYLIB_CURRENT_VERSION = 1;
@@ -1039,6 +1046,7 @@
10391046
CODE_SIGN_IDENTITY = "-";
10401047
CODE_SIGN_STYLE = Automatic;
10411048
COMBINE_HIDPI_IMAGES = YES;
1049+
DEAD_CODE_STRIPPING = YES;
10421050
DEFINES_MODULE = YES;
10431051
DYLIB_COMPATIBILITY_VERSION = 1;
10441052
DYLIB_CURRENT_VERSION = 1;
@@ -1065,6 +1073,7 @@
10651073
CODE_SIGN_IDENTITY = "-";
10661074
CODE_SIGN_STYLE = Automatic;
10671075
COMBINE_HIDPI_IMAGES = YES;
1076+
DEAD_CODE_STRIPPING = YES;
10681077
INFOPLIST_FILE = Tests/Info.plist;
10691078
LD_RUNPATH_SEARCH_PATHS = (
10701079
"$(inherited)",
@@ -1084,6 +1093,7 @@
10841093
CODE_SIGN_IDENTITY = "-";
10851094
CODE_SIGN_STYLE = Automatic;
10861095
COMBINE_HIDPI_IMAGES = YES;
1096+
DEAD_CODE_STRIPPING = YES;
10871097
INFOPLIST_FILE = Tests/Info.plist;
10881098
LD_RUNPATH_SEARCH_PATHS = (
10891099
"$(inherited)",

‎PrettyLogger.xcodeproj/xcshareddata/xcschemes/PrettyLogger-iOS.xcscheme‎

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1010"
3+
LastUpgradeVersion = "1420"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,8 +26,17 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
codeCoverageEnabled = "YES"
30-
shouldUseLaunchSchemeArgsEnv = "YES">
29+
shouldUseLaunchSchemeArgsEnv = "YES"
30+
codeCoverageEnabled = "YES">
31+
<MacroExpansion>
32+
<BuildableReference
33+
BuildableIdentifier = "primary"
34+
BlueprintIdentifier = "F2B655EB21E61459001B14A2"
35+
BuildableName = "PrettyLogger.framework"
36+
BlueprintName = "PrettyLogger-iOS"
37+
ReferencedContainer = "container:PrettyLogger.xcodeproj">
38+
</BuildableReference>
39+
</MacroExpansion>
3140
<Testables>
3241
<TestableReference
3342
skipped = "NO">
@@ -40,17 +49,6 @@
4049
</BuildableReference>
4150
</TestableReference>
4251
</Testables>
43-
<MacroExpansion>
44-
<BuildableReference
45-
BuildableIdentifier = "primary"
46-
BlueprintIdentifier = "F2B655EB21E61459001B14A2"
47-
BuildableName = "PrettyLogger.framework"
48-
BlueprintName = "PrettyLogger-iOS"
49-
ReferencedContainer = "container:PrettyLogger.xcodeproj">
50-
</BuildableReference>
51-
</MacroExpansion>
52-
<AdditionalOptions>
53-
</AdditionalOptions>
5452
</TestAction>
5553
<LaunchAction
5654
buildConfiguration = "Debug"
@@ -71,8 +69,6 @@
7169
ReferencedContainer = "container:PrettyLogger.xcodeproj">
7270
</BuildableReference>
7371
</MacroExpansion>
74-
<AdditionalOptions>
75-
</AdditionalOptions>
7672
</LaunchAction>
7773
<ProfileAction
7874
buildConfiguration = "Release"

‎PrettyLogger.xcodeproj/xcshareddata/xcschemes/PrettyLogger-macOS.xcscheme‎

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1010"
3+
LastUpgradeVersion = "1420"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,8 +26,17 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
codeCoverageEnabled = "YES"
30-
shouldUseLaunchSchemeArgsEnv = "YES">
29+
shouldUseLaunchSchemeArgsEnv = "YES"
30+
codeCoverageEnabled = "YES">
31+
<MacroExpansion>
32+
<BuildableReference
33+
BuildableIdentifier = "primary"
34+
BlueprintIdentifier = "F2B6564F21E6161B001B14A2"
35+
BuildableName = "PrettyLogger.framework"
36+
BlueprintName = "PrettyLogger-macOS"
37+
ReferencedContainer = "container:PrettyLogger.xcodeproj">
38+
</BuildableReference>
39+
</MacroExpansion>
3140
<Testables>
3241
<TestableReference
3342
skipped = "NO">
@@ -40,17 +49,6 @@
4049
</BuildableReference>
4150
</TestableReference>
4251
</Testables>
43-
<MacroExpansion>
44-
<BuildableReference
45-
BuildableIdentifier = "primary"
46-
BlueprintIdentifier = "F2B6564F21E6161B001B14A2"
47-
BuildableName = "PrettyLogger.framework"
48-
BlueprintName = "PrettyLogger-macOS"
49-
ReferencedContainer = "container:PrettyLogger.xcodeproj">
50-
</BuildableReference>
51-
</MacroExpansion>
52-
<AdditionalOptions>
53-
</AdditionalOptions>
5452
</TestAction>
5553
<LaunchAction
5654
buildConfiguration = "Debug"
@@ -71,8 +69,6 @@
7169
ReferencedContainer = "container:PrettyLogger.xcodeproj">
7270
</BuildableReference>
7371
</MacroExpansion>
74-
<AdditionalOptions>
75-
</AdditionalOptions>
7672
</LaunchAction>
7773
<ProfileAction
7874
buildConfiguration = "Release"

‎PrettyLogger.xcodeproj/xcshareddata/xcschemes/PrettyLogger-tvOS.xcscheme‎

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1010"
3+
LastUpgradeVersion = "1420"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,8 +26,17 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
codeCoverageEnabled = "YES"
30-
shouldUseLaunchSchemeArgsEnv = "YES">
29+
shouldUseLaunchSchemeArgsEnv = "YES"
30+
codeCoverageEnabled = "YES">
31+
<MacroExpansion>
32+
<BuildableReference
33+
BuildableIdentifier = "primary"
34+
BlueprintIdentifier = "F2B6561721E615E4001B14A2"
35+
BuildableName = "PrettyLogger.framework"
36+
BlueprintName = "PrettyLogger-tvOS"
37+
ReferencedContainer = "container:PrettyLogger.xcodeproj">
38+
</BuildableReference>
39+
</MacroExpansion>
3140
<Testables>
3241
<TestableReference
3342
skipped = "NO">
@@ -40,17 +49,6 @@
4049
</BuildableReference>
4150
</TestableReference>
4251
</Testables>
43-
<MacroExpansion>
44-
<BuildableReference
45-
BuildableIdentifier = "primary"
46-
BlueprintIdentifier = "F2B6561721E615E4001B14A2"
47-
BuildableName = "PrettyLogger.framework"
48-
BlueprintName = "PrettyLogger-tvOS"
49-
ReferencedContainer = "container:PrettyLogger.xcodeproj">
50-
</BuildableReference>
51-
</MacroExpansion>
52-
<AdditionalOptions>
53-
</AdditionalOptions>
5452
</TestAction>
5553
<LaunchAction
5654
buildConfiguration = "Debug"
@@ -71,8 +69,6 @@
7169
ReferencedContainer = "container:PrettyLogger.xcodeproj">
7270
</BuildableReference>
7371
</MacroExpansion>
74-
<AdditionalOptions>
75-
</AdditionalOptions>
7672
</LaunchAction>
7773
<ProfileAction
7874
buildConfiguration = "Release"

‎PrettyLogger.xcodeproj/xcshareddata/xcschemes/PrettyLogger-watchOS.xcscheme‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1010"
3+
LastUpgradeVersion = "1420"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,12 +26,10 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
codeCoverageEnabled = "YES"
30-
shouldUseLaunchSchemeArgsEnv = "YES">
29+
shouldUseLaunchSchemeArgsEnv = "YES"
30+
codeCoverageEnabled = "YES">
3131
<Testables>
3232
</Testables>
33-
<AdditionalOptions>
34-
</AdditionalOptions>
3533
</TestAction>
3634
<LaunchAction
3735
buildConfiguration = "Debug"
@@ -52,8 +50,6 @@
5250
ReferencedContainer = "container:PrettyLogger.xcodeproj">
5351
</BuildableReference>
5452
</MacroExpansion>
55-
<AdditionalOptions>
56-
</AdditionalOptions>
5753
</LaunchAction>
5854
<ProfileAction
5955
buildConfiguration = "Release"

‎Tests/OutputTests.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class OutputTests: XCTestCase {
1616
.output
1717
.delay(for: 2, scheduler: RunLoop.main)
1818
.sink { output in
19-
XCTAssertEqual(output.text, expectedOutput)
19+
XCTAssertEqual(output.formatted, expectedOutput)
2020
expirationComplete.fulfill()
2121
}
2222
.store(in: &cancellables)

0 commit comments

Comments
 (0)