Feature: pod add SwiftLog

alvincrisuy · Aug 7, 2018 · 1f523c0 · 1f523c0
1 parent ecfadf1
commit 1f523c0
Show file tree

Hide file tree

Showing 20 changed files with 2,019 additions and 1,400 deletions.
diff --git a/ClashX.xcodeproj/project.pbxproj b/ClashX.xcodeproj/project.pbxproj
@@ -479,6 +479,7 @@
 				"${BUILT_PRODUCTS_DIR}/RxCocoa/RxCocoa.framework",
 				"${BUILT_PRODUCTS_DIR}/RxSwift/RxSwift.framework",
 				"${PODS_ROOT}/Sparkle/Sparkle.framework",
+				"${BUILT_PRODUCTS_DIR}/SwiftLog/SwiftLog.framework",
 				"${BUILT_PRODUCTS_DIR}/SwiftyJSON/SwiftyJSON.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
@@ -488,6 +489,7 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxCocoa.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxSwift.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Sparkle.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftLog.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftyJSON.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;

diff --git a/ClashX/Basic/Logger.swift b/ClashX/Basic/Logger.swift
@@ -21,7 +21,7 @@ class Logger {
 
     static func log(msg:String) {
         if #available(OSX 10.12, *) {
-            os_log("%@", log: shared.logger!, type: .default, msg)
+            os_log("%{public}s", log: shared.logger!, type: .default, msg)
         } else {
             NSLog("%@", msg)
         }

diff --git a/Podfile b/Podfile
@@ -6,5 +6,6 @@ target 'ClashX' do
   pod 'SwiftyJSON', '~> 4.0'
   pod 'RxSwift',    '~> 4.0'
   pod 'RxCocoa',    '~> 4.0'
+  pod 'SwiftLog', '~> 1.0.0'
 end
 
diff --git a/Podfile.lock b/Podfile.lock
@@ -5,6 +5,7 @@ PODS:
     - RxSwift (~> 4.0)
   - RxSwift (4.2.0)
   - Sparkle (1.19.0)
+  - SwiftLog (1.0.0)
   - SwiftyJSON (4.1.0)
 
 DEPENDENCIES:
@@ -13,6 +14,7 @@ DEPENDENCIES:
   - RxCocoa (~> 4.0)
   - RxSwift (~> 4.0)
   - Sparkle
+  - SwiftLog (~> 1.0.0)
   - SwiftyJSON (~> 4.0)
 
 SPEC CHECKSUMS:
@@ -21,8 +23,9 @@ SPEC CHECKSUMS:
   RxCocoa: 0b54909c902e1e581212a03e690bbd94032d8baa
   RxSwift: 99e10317ddfcc7fbe01356aafd118fde4a0be104
   Sparkle: 8486d2493599665e466b5076e72b28849776e32f
+  SwiftLog: f6c4f9a4ade06263555ab34b2c0f72025ffcda9e
   SwiftyJSON: c29297daf073d2aa016295d5809cdd68045c39b3
 
-PODFILE CHECKSUM: 245bbc49106346303515c20d4e19cd496f2f3b71
+PODFILE CHECKSUM: fc69ca2b623a93ac89161e5986883dc8da46138b
 
 COCOAPODS: 1.4.0
diff --git a/Pods/Manifest.lock b/Pods/Manifest.lock
diff --git a/Pods/Pods.xcodeproj/project.pbxproj b/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/Pods/SwiftLog/LICENSE b/Pods/SwiftLog/LICENSE
diff --git a/Pods/SwiftLog/Log.swift b/Pods/SwiftLog/Log.swift
diff --git a/Pods/SwiftLog/README.md b/Pods/SwiftLog/README.md