From e0ee4e42f103d828389af31f2f54aadb2c658c42 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Wed, 5 Jul 2017 19:08:36 -0400 Subject: [PATCH] [SSK] Modify TSStorageManager to use separate shared read and write connections. // FREEBIE --- Podfile | 2 +- Podfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Podfile b/Podfile index 97a6c4a0a..9142205b5 100644 --- a/Podfile +++ b/Podfile @@ -5,7 +5,7 @@ target 'Signal' do pod 'SocketRocket', :git => 'https://github.com/facebook/SocketRocket.git' pod 'AxolotlKit', git: 'https://github.com/WhisperSystems/SignalProtocolKit.git' #pod 'AxolotlKit', path: '../SignalProtocolKit' - pod 'SignalServiceKit', git: 'https://github.com/WhisperSystems/SignalServiceKit.git', branch: 'charlesmchen/sharedReadAndWriteConnections' + pod 'SignalServiceKit', git: 'https://github.com/WhisperSystems/SignalServiceKit.git', branch: 'hotfix/2.13.3.0' #pod 'SignalServiceKit', path: '../SignalServiceKit' pod 'JSQMessagesViewController', git: 'https://github.com/WhisperSystems/JSQMessagesViewController.git', branch: 'mkirk/retain-keyboard-view' #pod 'JSQMessagesViewController', path: '../JSQMessagesViewController' diff --git a/Podfile.lock b/Podfile.lock index 3f03348d3..03d3f7edf 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -112,7 +112,7 @@ DEPENDENCIES: - JSQMessagesViewController (from `https://github.com/WhisperSystems/JSQMessagesViewController.git`, branch `mkirk/retain-keyboard-view`) - PureLayout - Reachability - - SignalServiceKit (from `https://github.com/WhisperSystems/SignalServiceKit.git`, branch `charlesmchen/sharedReadAndWriteConnections`) + - SignalServiceKit (from `https://github.com/WhisperSystems/SignalServiceKit.git`, branch `hotfix/2.13.3.0`) - SocketRocket (from `https://github.com/facebook/SocketRocket.git`) EXTERNAL SOURCES: @@ -122,7 +122,7 @@ EXTERNAL SOURCES: :branch: mkirk/retain-keyboard-view :git: https://github.com/WhisperSystems/JSQMessagesViewController.git SignalServiceKit: - :branch: charlesmchen/sharedReadAndWriteConnections + :branch: hotfix/2.13.3.0 :git: https://github.com/WhisperSystems/SignalServiceKit.git SocketRocket: :git: https://github.com/facebook/SocketRocket.git @@ -135,7 +135,7 @@ CHECKOUT OPTIONS: :commit: 521686c112bbae7a762f85d52b1e41eeb1760772 :git: https://github.com/WhisperSystems/JSQMessagesViewController.git SignalServiceKit: - :commit: daae31d30e06af5ba0e0d6dadf0bdac5ac02520b + :commit: e24f18320d3aefe87d2532c9f0520348c4598cb2 :git: https://github.com/WhisperSystems/SignalServiceKit.git SocketRocket: :commit: 877ac7438be3ad0b45ef5ca3969574e4b97112bf @@ -162,6 +162,6 @@ SPEC CHECKSUMS: UnionFind: c33be5adb12983981d6e827ea94fc7f9e370f52d YapDatabase: cd911121580ff16675f65ad742a9eb0ab4d9e266 -PODFILE CHECKSUM: b1209bb9aaf3d342053a46ad41556c3e9a49bb8d +PODFILE CHECKSUM: 9418ef3ac76aae00ac06776ba8cb66a140fdd743 COCOAPODS: 1.2.1