Merge pull request #3 from allaboutapps/feature/logbook-instance

Feature/logbook instance
allaboutapps · Sep 22, 2022 · 8ea1540 · 8ea1540
2 parents 924bc72 + e800d18
commit 8ea1540
Show file tree

Hide file tree

Showing 12 changed files with 463 additions and 112 deletions.
diff --git a/Example/AppDelegate.swift b/Example/AppDelegate.swift
@@ -52,7 +52,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 //        addFileLog()
 
         // testmessage
-        logToFile()
+        // logToFile()
 
         return true
     }

diff --git a/Example/ViewController.swift b/Example/ViewController.swift
@@ -12,9 +12,6 @@ class ViewController: UIViewController {
 
     override func viewDidLoad() {
         super.viewDidLoad()
-        // Do any additional setup after loading the view.
     }
 
-
 }
-
diff --git a/Logbook.xcodeproj/project.pbxproj b/Logbook.xcodeproj/project.pbxproj
@@ -31,6 +31,8 @@
 		19E97613238FE71D00ECED37 /* OSLogSink.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19E97612238FE71D00ECED37 /* OSLogSink.swift */; };
 		19E9761A23901FC200ECED37 /* LogCategoryFilter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19E9761923901FC200ECED37 /* LogCategoryFilter.swift */; };
 		C8D5F3962844B088004FBCCB /* FileLogTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8D5F3952844B088004FBCCB /* FileLogTests.swift */; };
+		F80857D728DB09C200F75461 /* ClosureLogSink.swift in Sources */ = {isa = PBXBuildFile; fileRef = F80857D628DB09C200F75461 /* ClosureLogSink.swift */; };
+		F80857D928DB0AA700F75461 /* ClosureLogTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F80857D828DB0AA700F75461 /* ClosureLogTests.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -101,6 +103,8 @@
 		19E97612238FE71D00ECED37 /* OSLogSink.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OSLogSink.swift; sourceTree = "<group>"; };
 		19E9761923901FC200ECED37 /* LogCategoryFilter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LogCategoryFilter.swift; sourceTree = "<group>"; };
 		C8D5F3952844B088004FBCCB /* FileLogTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FileLogTests.swift; sourceTree = "<group>"; };
+		F80857D628DB09C200F75461 /* ClosureLogSink.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ClosureLogSink.swift; sourceTree = "<group>"; };
+		F80857D828DB0AA700F75461 /* ClosureLogTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ClosureLogTests.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -179,6 +183,7 @@
 		19E975EA238EBB7400ECED37 /* LogbookTests */ = {
 			isa = PBXGroup;
 			children = (
+				F80857D828DB0AA700F75461 /* ClosureLogTests.swift */,
 				C8D5F3952844B088004FBCCB /* FileLogTests.swift */,
 				19E975EB238EBB7400ECED37 /* LogbookTests.swift */,
 				19E975ED238EBB7400ECED37 /* Info.plist */,
@@ -205,6 +210,7 @@
 		19E975FA238EBBC200ECED37 /* Sink */ = {
 			isa = PBXGroup;
 			children = (
+				F80857D628DB09C200F75461 /* ClosureLogSink.swift */,
 				19E975FB238EBBC200ECED37 /* ConsoleLogSink.swift */,
 				19E9760D238FB22C00ECED37 /* FileLogSink.swift */,
 				19E975FC238EBBC200ECED37 /* LogSink.swift */,
@@ -298,7 +304,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 1120;
-				LastUpgradeCheck = 1120;
+				LastUpgradeCheck = 1340;
 				ORGANIZATIONNAME = "allaboutapps GmbH";
 				TargetAttributes = {
 					19E97560238EB47F00ECED37 = {
@@ -386,6 +392,7 @@
 				19E9760B238EC2B400ECED37 /* LogPlaceholder.swift in Sources */,
 				19E97603238EBBC300ECED37 /* LogLevel.swift in Sources */,
 				19E97602238EBBC300ECED37 /* LogCategory.swift in Sources */,
+				F80857D728DB09C200F75461 /* ClosureLogSink.swift in Sources */,
 				19E97613238FE71D00ECED37 /* OSLogSink.swift in Sources */,
 				19E97609238EBF3F00ECED37 /* LogMessage.swift in Sources */,
 			);
@@ -395,6 +402,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				F80857D928DB0AA700F75461 /* ClosureLogTests.swift in Sources */,
 				19E975EC238EBB7400ECED37 /* LogbookTests.swift in Sources */,
 				C8D5F3962844B088004FBCCB /* FileLogTests.swift in Sources */,
 			);
@@ -466,6 +474,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -526,6 +535,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -605,7 +615,7 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = Logbook/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -635,7 +645,7 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = Logbook/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",

diff --git a/Logbook.xcodeproj/xcshareddata/xcschemes/Example.xcscheme b/Logbook.xcodeproj/xcshareddata/xcschemes/Example.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1120"
+   LastUpgradeVersion = "1340"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,7 +26,18 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      codeCoverageEnabled = "YES"
+      onlyGenerateCoverageForSpecifiedTargets = "YES">
+      <CodeCoverageTargets>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "19E975DB238EBB7400ECED37"
+            BuildableName = "Logbook.framework"
+            BlueprintName = "Logbook"
+            ReferencedContainer = "container:Logbook.xcodeproj">
+         </BuildableReference>
+      </CodeCoverageTargets>
       <Testables>
          <TestableReference
             skipped = "NO">

diff --git a/Logbook.xcodeproj/xcshareddata/xcschemes/Logbook.xcscheme b/Logbook.xcodeproj/xcshareddata/xcschemes/Logbook.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1120"
+   LastUpgradeVersion = "1340"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"