REM SwiftyBeaver, MOD minimum deployment version set to iOS 14, ADD OSLog (#33)

* REM SwiftyBeaver, MOD minimum deployment version set to iOS 14, ADD OSLog for logging.

* REM SwiftyBeaver dependencies from SPM & CocoaPods

Author: haidlbear

GirdersSwift.podspec

@@ -24,7 +24,6 @@ Pod::Spec.new do |s|
 
 
   s.source_files = 'Sources/GirdersSwift/**/*.{swift}'
-  s.dependency 'SwiftyBeaver', '1.9.5'
   s.dependency 'KeychainAccess', '4.2.2'
   s.dependency 'PromiseKit', '6.17.1'
   s.frameworks = 'Foundation', 'Security'

Package.resolved

@@ -6,23 +6,22 @@ import PackageDescription
 let package = Package(
     name: "GirdersSwift",
     platforms: [
-        .iOS(.v12)
+        .iOS(.v14)
     ],
     products: [
         .library(
             name: "GirdersSwift",
             targets: ["GirdersSwift", "GRSecurity"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/SwiftyBeaver/SwiftyBeaver.git", exact: "1.9.5"),
         .package(url: "https://github.com/mxcl/PromiseKit.git", exact: "6.17.1"),
         .package(url: "https://github.com/kishikawakatsumi/KeychainAccess.git", exact: "4.2.2"),
         .package(url: "https://github.com/AliSoftware/OHHTTPStubs.git", exact: "9.0.0")
     ],
     targets: [
         .target(
             name: "GirdersSwift",
-            dependencies: ["SwiftyBeaver", "PromiseKit", "KeychainAccess"]),
+            dependencies: ["PromiseKit", "KeychainAccess"]),
         .binaryTarget(
             name: "GRSecurity",
             path: "Sources/GRSecurity.xcframework"
@@ -31,7 +30,6 @@ let package = Package(
             name: "GirdersSwiftTests",
             dependencies: [
                 "GirdersSwift",
-                "SwiftyBeaver",
                 .product(name: "OHHTTPStubsSwift", package: "OHHTTPStubs")
             ],
             resources: [

Package.swift

@@ -5,13 +5,11 @@ source 'https://cdn.cocoapods.org/'
 use_frameworks!
 
 target :GirdersSwift do
-  pod 'SwiftyBeaver', '1.9.5'
   pod 'PromiseKit', '6.17.1'
   pod 'KeychainAccess', '4.2.2'
 end
 
 target :UnitTest do
-  pod 'SwiftyBeaver', '1.9.5'
   pod 'OHHTTPStubs/Swift', '7.0.0'
 end
 

Podfile

@@ -9,22 +9,15 @@ public func loadConfig(fromResource resource: String, bundle: Bundle = Bundle.ma
     let resource = resource as NSString
     let filename = resource.lastPathComponent as NSString
     let url = bundle.url(forResource: filename.deletingPathExtension,
-                              withExtension: resource.pathExtension)
+                         withExtension: resource.pathExtension)
 
-    guard let pathUrl = url else {
-        return [:]
-    }
+    guard let pathUrl = url,
+          let data = try? Data.init(contentsOf: pathUrl),
+          let dict = try? PropertyListSerialization.propertyList(from: data,
+                                                                 options: [],
+                                                                 format: nil) as? [String : Any] else { return [:] }
 
-    do {
-        let data = try Data.init(contentsOf: pathUrl)
-        let dict = try PropertyListSerialization.propertyList(from: data,
-                                                              options: [],
-                                                              format: nil) as? [String : Any]
-        return dict ?? [:]
-    } catch {
-        Log.error("error loading configuration")
-        return [:]
-    }
+    return dict
 }
 
 /// Returns the plist path as a string for a given resource and bundle.

Sources/GirdersSwift/config/ConfigUtil.swift

@@ -0,0 +1,16 @@
+enum LogLevel: Int {
+    
+    case debug = 0
+    case info = 1
+    case error = 2
+    case fault = 3
+    
+}
+
+extension LogLevel: Comparable {
+    
+    static func < (lhs: LogLevel, rhs: LogLevel) -> Bool {
+        lhs.rawValue < rhs.rawValue
+    }
+    
+}

Sources/GirdersSwift/util/Log.swift

@@ -0,0 +1,58 @@
+import OSLog
+
+public var Log = Logging()
+
+
+/// Logger class implementing the LogProtocol.
+public class Logging {
+    
+    let logger = Logger(subsystem: "com.github.GirdersSwift", category: "GirdersSwift")
+    let thresholdLevel: LogLevel = {
+        guard let rawLogLevel = Configuration.sharedInstance[Constants.LogLevel] as? Int,
+              let level = LogLevel(rawValue: rawLogLevel) else {
+            return .debug
+        }
+        return level
+    }()
+    
+    public func debug(_ message: String) {
+        log(.debug, message)
+    }
+    
+    public func info(_ message: String) {
+        log(.info, message)
+    }
+    
+    public func error(_ message: String) {
+        log(.error, message)
+    }
+    
+    public func fault(_ message: String) {
+        log(.fault, message)
+    }
+    
+}
+
+private extension Logging {
+    
+    func log(_ level: LogLevel, _ message: String) {
+        guard level >= thresholdLevel else {
+            return
+        }
+        logger.log(level: level.osLogType, "\(message)")
+    }
+    
+}
+
+private extension LogLevel {
+    
+    var osLogType: OSLogType {
+        switch self {
+        case .debug: return .debug
+        case .info: return .info
+        case .error: return .error
+        case .fault: return .fault
+        }
+    }
+    
+}