Update CocoaAsyncSocket and CocoaLumberjack

fengjixuchui · Feb 28, 2020 · 4067e26 · 4067e26
1 parent 03b6a74
commit 4067e26
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 26 deletions.
diff --git a/ChatSecureCore/Classes/Categories/UIApplication+ChatSecure.swift b/ChatSecureCore/Classes/Categories/UIApplication+ChatSecure.swift
@@ -280,9 +280,9 @@ extension UIApplication {
         let username = account.username
         var body = "\(CONNECTION_ERROR_STRING()) \(username)."
 
+
         if error.domain == GCDAsyncSocketErrorDomain,
-            let code = GCDAsyncSocketError(rawValue: error.code) {
-
+            let code = GCDAsyncSocketError.Code.init(rawValue: error.code) {
             switch code {
             case .noError,
                  .connectTimeoutError,

diff --git a/ChatSecureCore/Classes/View Controllers/OTRLogListViewController.swift b/ChatSecureCore/Classes/View Controllers/OTRLogListViewController.swift
@@ -319,7 +319,7 @@ extension OTRLogListViewController: UITableViewDataSource {
             if indexPath.row == 0 {
                 cell.textLabel?.font = UIFont.boldSystemFont(ofSize: 17)
             }
-            cell.textLabel?.text = DateFormatter.localizedString(from: file.modificationDate, dateStyle: .long, timeStyle: .long)
+            cell.textLabel?.text = file.modificationDate.flatMap { DateFormatter.localizedString(from: $0, dateStyle: .long, timeStyle: .long) }
             let bytes = ByteCountFormatter.string(fromByteCount: Int64(file.fileSize), countStyle: .file)
             cell.detailTextLabel?.text = bytes
             cell.accessoryType = .disclosureIndicator

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -15,10 +15,10 @@ GEM
     atomos (0.1.3)
     babosa (1.0.3)
     claide (1.0.3)
-    cocoapods (1.8.4)
+    cocoapods (1.9.0)
       activesupport (>= 4.0.2, < 5)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.8.4)
+      cocoapods-core (= 1.9.0)
       cocoapods-deintegrate (>= 1.0.3, < 2.0)
       cocoapods-downloader (>= 1.2.2, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -33,13 +33,15 @@ GEM
       molinillo (~> 0.6.6)
       nap (~> 1.0)
       ruby-macho (~> 1.4)
-      xcodeproj (>= 1.11.1, < 2.0)
-    cocoapods-core (1.8.4)
+      xcodeproj (>= 1.14.0, < 2.0)
+    cocoapods-core (1.9.0)
       activesupport (>= 4.0.2, < 6)
       algoliasearch (~> 1.0)
       concurrent-ruby (~> 1.1)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
+      netrc (~> 0.11)
+      typhoeus (~> 1.0)
     cocoapods-deintegrate (1.0.4)
     cocoapods-downloader (1.3.0)
     cocoapods-plugins (1.0.0)
@@ -63,6 +65,8 @@ GEM
     dotenv (2.7.5)
     emoji_regex (1.0.1)
     escape (0.0.4)
+    ethon (0.12.0)
+      ffi (>= 1.3.0)
     excon (0.72.0)
     faraday (0.17.3)
       multipart-post (>= 1.2, < 3)
@@ -72,7 +76,7 @@ GEM
     faraday_middleware (0.13.1)
       faraday (>= 0.7.4, < 1.0)
     fastimage (2.1.7)
-    fastlane (2.141.0)
+    fastlane (2.142.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.3, < 3.0.0)
       babosa (>= 1.0.2, < 2.0.0)
@@ -109,6 +113,7 @@ GEM
       xcodeproj (>= 1.13.0, < 2.0.0)
       xcpretty (~> 0.3.0)
       xcpretty-travis-formatter (>= 0.0.3)
+    ffi (1.12.2)
     fourflusher (2.3.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
@@ -133,8 +138,8 @@ GEM
       google-cloud-core (~> 1.2)
       googleauth (~> 0.9)
       mini_mime (~> 1.0)
-    googleauth (0.10.0)
-      faraday (~> 0.12)
+    googleauth (0.11.0)
+      faraday (>= 0.17.3, < 2.0)
       jwt (>= 1.4, < 3.0)
       memoist (~> 0.16)
       multi_json (~> 1.11)
@@ -172,9 +177,9 @@ GEM
     ruby-macho (1.4.0)
     rubyzip (1.3.0)
     security (0.1.3)
-    signet (0.12.0)
+    signet (0.13.0)
       addressable (~> 2.3)
-      faraday (~> 0.9)
+      faraday (>= 0.17.3, < 2.0)
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
     simctl (1.6.8)
@@ -189,6 +194,8 @@ GEM
     tty-screen (0.7.1)
     tty-spinner (0.9.3)
       tty-cursor (~> 0.7)
+    typhoeus (1.3.1)
+      ethon (>= 0.9.0)
     tzinfo (1.2.6)
       thread_safe (~> 0.1)
     uber (0.1.0)

diff --git a/Podfile.lock b/Podfile.lock
@@ -53,11 +53,11 @@ PODS:
     - YapDatabase/SQLCipher (~> 3.1.3)
     - YapTaskQueue/SQLCipher
     - ZXingObjC/QRCode (~> 3.6)
-  - CocoaAsyncSocket (7.6.3)
-  - CocoaLumberjack (3.6.0):
-    - CocoaLumberjack/Core (= 3.6.0)
-  - CocoaLumberjack/Core (3.6.0)
-  - CocoaLumberjack/Swift (3.6.0):
+  - CocoaAsyncSocket (7.6.4)
+  - CocoaLumberjack (3.6.1):
+    - CocoaLumberjack/Core (= 3.6.1)
+  - CocoaLumberjack/Core (3.6.1)
+  - CocoaLumberjack/Swift (3.6.1):
     - CocoaLumberjack/Core
   - CPAProxy (2.0.0)
   - DTFoundation/Core (1.7.14)
@@ -71,7 +71,7 @@ PODS:
   - GCDWebServer (3.5.3):
     - GCDWebServer/Core (= 3.5.3)
   - GCDWebServer/Core (3.5.3)
-  - HTMLReader (2.1.4)
+  - HTMLReader (2.1.5)
   - IOCipher/common (0.1.0):
     - CocoaLumberjack
     - libsqlfs/SQLCipher
@@ -99,14 +99,14 @@ PODS:
   - libsqlfs/SQLCipher (1.3.2):
     - libsqlfs/common
     - SQLCipher (>= 3.4.0)
-  - LicensePlist (2.11.2)
+  - LicensePlist (2.13.0)
   - LumberjackConsole (3.3.1):
     - CocoaLumberjack (>= 3.x)
     - NBUCore (>= 2.1.0)
   - Mantle (2.1.0):
     - Mantle/extobjc (= 2.1.0)
   - Mantle/extobjc (2.1.0)
-  - MBProgressHUD (1.1.0)
+  - MBProgressHUD (1.2.0)
   - MWFeedParser (1.0.1):
     - MWFeedParser/FeedParser (= 1.0.1)
     - "MWFeedParser/NSDate+InternetDateTime (= 1.0.1)"
@@ -326,13 +326,13 @@ SPEC CHECKSUMS:
   BButton: ab0f2ed3b998ae73c5188b57d270d81e4a1eeb27
   ChatSecure-Push-iOS: b1e7f4133afb77a42464aa0be96b14e03edcef29
   ChatSecureCore: 08d24a7ddfdff59bd9afaec3141e1e26d50271db
-  CocoaAsyncSocket: eafaa68a7e0ec99ead0a7b35015e0bf25d2c8987
-  CocoaLumberjack: 78b0c238666f4f58db069738ec176f4519557516
+  CocoaAsyncSocket: 694058e7c0ed05a9e217d1b3c7ded962f4180845
+  CocoaLumberjack: b17ae15142558d08bbacf69775fa10c4abbebcc9
   CPAProxy: fdb5600a16502e7c8176ab59e7e9c306fbe5dc59
   DTFoundation: 25aa19bb7c6e225b1dfae195604fb8cf1da0ab4c
   FormatterKit: 184db51bf120b633693a73624a4cede89ec51a41
   GCDWebServer: c0ab22c73e1b84f358d1e2f74bf6afd1c60829f2
-  HTMLReader: 2fc5ccf6a041b7070d9b43b101034cba63d2ae2a
+  HTMLReader: 8056b3418baad09718902a1b39361c63b14a894f
   IOCipher: 89435857693a11d24024cbc3da541549eb36fb0e
   JSQMessagesViewController: eade14c4687901c4e53dec681b8e3021269a2b38
   JTSImageViewController: 1f8ce1cc93dab0d0af8e53badeea7528560cfec9
@@ -341,10 +341,10 @@ SPEC CHECKSUMS:
   KVOController: d72ace34afea42468329623b3379ab3cd1d286b6
   libidn: e4576a956b797c584c77aaedfc6e3dd639b61bdc
   libsqlfs: b3c1be163c2fba6b041379cfa5861033783ddae9
-  LicensePlist: e7777131e81a6b6c803f5f2b866bf7881b11ed4b
+  LicensePlist: a5395002c74b45c38bb8661374f5608534f0f5a7
   LumberjackConsole: 218fed8e807ba6ce0bedbba06b7b295dc0efaf0c
   Mantle: bdb09649c721dcefc53132f3767f6e40d4d47740
-  MBProgressHUD: e7baa36a220447d8aeb12769bf0585582f3866d9
+  MBProgressHUD: 3ee5efcc380f6a79a7cc9b363dd669c5e1ae7406
   MWFeedParser: 2cf646014c1baf6ad1b08c480b40a08180079247
   NBUCore: 201af50441f48513ef6d5823a5fc12c9e1f288cd
   OpenInChrome: f1f3f9dec682216fe78a0d7fe0b5b263d6312c32
@@ -367,4 +367,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 0581b06632eb5047847f0daf2042a99bbbed22ca
 
-COCOAPODS: 1.8.4
+COCOAPODS: 1.9.0