Merge branch 'develop'

Author: alexanderwe

.github/workflows/main.yml

@@ -1,12 +1,6 @@
 name: CI
 
-on:
-  push:
-    branches:
-    - master
-    - develop
-    - /^hotfix.*$/
-    - /^feature.*$/
+on: [push]
 
 jobs:
   tests:
@@ -22,4 +16,4 @@ jobs:
     steps:
     - uses: actions/checkout@v1
     - name: fastlane ios compatibilityTests
-      run: fastlane ios compatibilityTests
+      run: fastlane ios compatibilityTests

.gitignore

@@ -29,7 +29,7 @@ Icon
 ._*
 
 # Documentation
-Documentation
+#Documentation
 
 # Files that might appear in the root of a volume
 .DocumentRevisions-V100
@@ -107,3 +107,4 @@ fastlane/test_output
 .bundle/**
 .vendor/**
 .swiftpm/**
+.vendor/**

.jazzy.yaml

@@ -4,4 +4,4 @@ copyright: Copyright 2020 Alexander Weiß
 author: Alexander Weiß
 xcodebuild_arguments: [-target, LoggingKit-iOS]
 clean: true
-output: ./Documentation
+output: ./docs

Configs/LoggingKit.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.0</string>
+	<string>2.0.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

Configs/LoggingKitTests.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.0</string>
+	<string>2.0.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

Example/AppDelegate.swift

@@ -7,6 +7,7 @@
 //
 
 import UIKit
+import LoggingKit
 
 // MARK: - AppDelegate
 
@@ -30,12 +31,18 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     /// - Returns: The launch result
     func application(_ application: UIApplication,
                      didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
+        
+        
+        LogService.register(logProviders: MyTestLogProvider())
+        
+        
         // Initialize UIWindow
         self.window = .init(frame: UIScreen.main.bounds)
         // Set RootViewController
         self.window?.rootViewController = self.rootViewController
         // Make Key and Visible
         self.window?.makeKeyAndVisible()
+    
         // Return positive launch
         return true
     }

Example/MyTestLogProvider.swift

@@ -0,0 +1,36 @@
+//
+//  MyTestLogProvider.swift
+//  Example
+//
+//  Created by Alexander Weiß on 13.06.20.
+//  Copyright © 2020 Alexander Weiß. All rights reserved.
+//
+
+import Foundation
+import LoggingKit
+
+class MyTestLogProvider: LogProvider {
+    
+    static var dateFormatter: DateFormatter = {
+        let df = DateFormatter()
+        df.dateFormat = "yyyy-MM-dd HH:mm:ssSSS"
+        df.locale = Locale.current
+        df.timeZone = TimeZone.current
+        return df
+    }()
+    
+    
+    func log(_ event: LogType, _ message: @autoclosure () -> Any?, logCategory: KeyPath<LogCategories, LogCategory>, fileName: StaticString, functionName: StaticString, lineNumber: Int) {
+        
+        guard let message = message() else {
+            return
+        }
+        
+        let category = LoggingCategories[logCategory]
+        let timeString = MyTestLogProvider.dateFormatter.string(from: Date())
+        let fileString = "[\((String(describing: fileName) as NSString).lastPathComponent):\(lineNumber)] \(functionName)"
+        
+        print("\(timeString) [\(event.rawValue)] - [\(category._key)] - \(fileString) > \(message)")
+        
+    }
+}

Example/Resources/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.0</string>
+	<string>2.0.0</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>LSRequiresIPhoneOS</key>

Example/ViewController.swift

@@ -43,10 +43,12 @@ class ViewController: UIViewController {
         self.view.backgroundColor = .white
 
         // Traditional methods
-        logger.debug("Hello Debug", logCategory: \.viewControllers)
-        logger.info("Hello Info", logCategory: \.viewControllers)
-        logger.fault("Hello Fault", logCategory: \.viewControllers)
-        logger.error("Hello Error", logCategory: \.viewControllers)
+        LogService.shared.debug("Hello Debug", logCategory: \.viewControllers)
+        LogService.shared.verbose("Hello Verbose", logCategory: \.viewControllers)
+        LogService.shared.info("Hello Info", logCategory: \.viewControllers)
+        LogService.shared.warning("Hello Warning", logCategory: \.viewControllers)
+        LogService.shared.error("Hello Error", logCategory: \.viewControllers)
+
 
         // Combine publishers
         sub = Result<Int, NumberError>.Publisher(5)