Merge branch 'charlesmchen/updatePodsAndCarthage'

Cartfile.resolved

@@ -1 +1 @@
-github "mxcl/PromiseKit" "4.0.5"
+github "mxcl/PromiseKit" "4.1.7"

Carthage

@@ -1 +1 @@
-Subproject commit 6b7d2c33e274c26b13d3511fbd8b52b50401737a
+Subproject commit ffb30d7e661a8501b2a0622334ad6b6fe136e00c

Podfile.lock

@@ -19,13 +19,13 @@ PODS:
     - 25519 (~> 2.0.1)
     - HKDFKit (~> 0.0.3)
     - ProtocolBuffers (~> 1.9.8)
-  - CocoaLumberjack (2.2.0):
+  - CocoaLumberjack (2.4.0):
-    - CocoaLumberjack/Default (= 2.2.0)
+    - CocoaLumberjack/Default (= 2.4.0)
-    - CocoaLumberjack/Extensions (= 2.2.0)
+    - CocoaLumberjack/Extensions (= 2.4.0)
-  - CocoaLumberjack/Core (2.2.0)
+  - CocoaLumberjack/Core (2.4.0)
-  - CocoaLumberjack/Default (2.2.0):
+  - CocoaLumberjack/Default (2.4.0):
     - CocoaLumberjack/Core
-  - CocoaLumberjack/Extensions (2.2.0):
+  - CocoaLumberjack/Extensions (2.4.0):
     - CocoaLumberjack/Default
   - FFCircularProgressView (0.5)
   - HKDFKit (0.0.3)
@@ -111,9 +111,9 @@ PODS:
     - YapDatabase/SQLCipher/Core
   - YapDatabase/SQLCipher/Extensions/Views (2.9.2):
     - YapDatabase/SQLCipher/Core
-  - ZXingObjC (3.1.0):
+  - ZXingObjC (3.2.1):
-    - ZXingObjC/All (= 3.1.0)
+    - ZXingObjC/All (= 3.2.1)
-  - ZXingObjC/All (3.1.0)
+  - ZXingObjC/All (3.2.1)
 
 DEPENDENCIES:
   - AxolotlKit (from `https://github.com/WhisperSystems/SignalProtocolKit.git`)
@@ -143,14 +143,14 @@ CHECKOUT OPTIONS:
     :commit: 5ed95c4782be899e81b85196c4695cdb9e45276b
     :git: https://github.com/WhisperSystems/SignalServiceKit.git
   SocketRocket:
-    :commit: 41b57bb2fc292a814f758441a05243eb38457027
+    :commit: 877ac7438be3ad0b45ef5ca3969574e4b97112bf
     :git: https://github.com/facebook/SocketRocket.git
 
 SPEC CHECKSUMS:
   '25519': dc4bad7e2dbcbf1efa121068a705a44cd98c80fc
   AFNetworking: 5e0e199f73d8626b11e79750991f5d173d1f8b67
   AxolotlKit: 240c7d761e4b1be9c6de78ebec498aaeedc978f4
-  CocoaLumberjack: 17fe8581f84914d5d7e6360f7c70022b173c3ae0
+  CocoaLumberjack: aa9dcab71bdf9eaf2a63bbd9ddc87863efe45457
   FFCircularProgressView: 683a4ab1e1bd613246a3dffa61503ffdebcde8d8
   HKDFKit: c058305d6f64b84f28c50bd7aa89574625bcb62a
   JSQMessagesViewController: 39fed975e3c9f8eba7292071e29eeb541d105e66
@@ -170,7 +170,7 @@ SPEC CHECKSUMS:
   TwistedOakCollapsingFutures: f359b90f203e9ab13dfb92c9ff41842a7fe1cd0c
   UnionFind: c33be5adb12983981d6e827ea94fc7f9e370f52d
   YapDatabase: b1e43555a34a5298e23a045be96817a5ef0da58f
-  ZXingObjC: bf15b3814f7a105b6d99f47da2333c93a063650a
+  ZXingObjC: bbf7b8f0cf8933fdd33eb4f9f46e22308552869b
 
 PODFILE CHECKSUM: 23ca4df281ad1e794af6967db2047f43df88e96a