Merge branch 'release/1.5.3'

RakuyoKit · Sep 22, 2021 · cd5a926 · cd5a926
2 parents 5b2a9be + 8753ea9
commit cd5a926
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 22 deletions.
diff --git a/RaLog.podspec b/RaLog.podspec
@@ -5,7 +5,7 @@ Pod::Spec.new do |s|
 
   s.name             = 'RaLog'
 
-  s.version          = '1.5.2'
+  s.version          = '1.5.3'
 
   s.summary          = 'A logging framework.'
 

diff --git a/RaLog.xcodeproj/project.pbxproj b/RaLog.xcodeproj/project.pbxproj
@@ -388,7 +388,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 202109091127;
+				CURRENT_PROJECT_VERSION = 202109220919;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 5C9JW4S9DE;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -402,7 +402,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.5.2;
+				MARKETING_VERSION = 1.5.3;
 				PRODUCT_BUNDLE_IDENTIFIER = com.rakuyo.RaLog;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
@@ -415,7 +415,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 202109091127;
+				CURRENT_PROJECT_VERSION = 202109220919;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 5C9JW4S9DE;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -429,7 +429,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.5.2;
+				MARKETING_VERSION = 1.5.3;
 				PRODUCT_BUNDLE_IDENTIFIER = com.rakuyo.RaLog;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;

diff --git a/Sources/RaLog/Built-in.swift b/Sources/RaLog/Built-in.swift
@@ -10,12 +10,12 @@ import UIKit
 
 /// Built-in log identifier.
 public extension Log.Flag {
-    static let debug      : Log.Flag = "👾 Debug"
-    static let warning    : Log.Flag = "⚠️ Warning"
-    static let success    : Log.Flag = "✅ Success"
-    static let error      : Log.Flag = "❌ Error"
-    static let `deinit`   : Log.Flag = "⁉️ Deinit"
-    static let jump       : Log.Flag = "👋 Jump"
+    static let debug: Log.Flag = "👾 Debug"
+    static let warning: Log.Flag = "⚠️ Warning"
+    static let success: Log.Flag = "✅ Success"
+    static let error: Log.Flag = "❌ Error"
+    static let `deinit`: Log.Flag = "⁉️ Deinit"
+    static let jump: Log.Flag = "👋 Jump"
 }
 
 /// Built-in prefix log.

diff --git a/Sources/RaLog/Log.swift b/Sources/RaLog/Log.swift
@@ -142,10 +142,10 @@ extension Log: Equatable {
     public static func == (lhs: Log, rhs: Log) -> Bool {
         // The `timestamp` & `line` is enough to filter out most cases, and finally judge the `logedStr`.
         return lhs.timestamp == rhs.timestamp
-            && lhs.line      == rhs.line
-            && lhs.file  == rhs.file
-            && lhs.safeLog   == rhs.safeLog
-            && lhs.logedStr  == rhs.logedStr
+            && lhs.line == rhs.line
+            && lhs.file == rhs.file
+            && lhs.safeLog == rhs.safeLog
+            && lhs.logedStr == rhs.logedStr
     }
 }
 

diff --git a/Sources/RaLog/Printable.swift b/Sources/RaLog/Printable.swift
@@ -53,7 +53,6 @@ public extension Printable {
     @inline(__always) @discardableResult
     static func print<T: LogModelProtocol>(_ log: T) -> T {
         #if DEBUG
-
         // 1. store format log
         log.logedStr = self.format(log)
 
@@ -62,12 +61,11 @@ public extension Printable {
             Swift.print(log.logedStr)
         }
 
-        #endif
-
         // 3. store
         if let storable = self as? Storable.Type {
             storable.store(log)
         }
+        #endif
 
         // 4. return
         return log

diff --git a/Sources/RaLog/Storable.swift b/Sources/RaLog/Storable.swift
@@ -210,10 +210,8 @@ public extension Storable {
                 }
 
             case .continuous(let count):
-
                 switch result {
                 case .success:
-
                     // reset to 0
                     failureCount = 0
 
@@ -225,7 +223,6 @@ public extension Storable {
                 }
 
             case .grandTotal(let count):
-
                 switch result {
                 case .success: break
                 case .failure(let error):

diff --git a/Sources/RaLog/WebView+RaLog.swift b/Sources/RaLog/WebView+RaLog.swift
@@ -30,7 +30,6 @@ public extension RaLogCompatible {
 extension WKWebView: RaLogCompatible {}
 
 public extension RaLogWrapper where Base: WKWebView {
-
     /// Add script to WKWebView for intercepting `console.log`.
     ///
     /// When the post closure is `nil` (default), the following method will be used to pass data to the native: