diff --git a/Podfile b/Podfile index 6665c0f11..8fd239f14 100644 --- a/Podfile +++ b/Podfile @@ -5,8 +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' - pod 'SignalServiceKit', git: 'https://github.com/WhisperSystems/SignalServiceKit.git', :branch => 'charlesmchen/webrtcByDefault' + pod 'SignalServiceKit', git: 'https://github.com/WhisperSystems/SignalServiceKit.git' #pod 'SignalServiceKit', path: '../SignalServiceKit' pod 'OpenSSL' pod 'PastelogKit', '~> 1.3' diff --git a/Podfile.lock b/Podfile.lock index ae8e05b2b..4b69364d5 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -123,7 +123,7 @@ DEPENDENCIES: - PastelogKit (~> 1.3) - PureLayout - SCWaveformView (~> 1.0) - - SignalServiceKit (from `https://github.com/WhisperSystems/SignalServiceKit.git`, branch `charlesmchen/webrtcByDefault`) + - SignalServiceKit (from `https://github.com/WhisperSystems/SignalServiceKit.git`) - SocketRocket (from `https://github.com/facebook/SocketRocket.git`) - ZXingObjC @@ -131,7 +131,6 @@ EXTERNAL SOURCES: AxolotlKit: :git: https://github.com/WhisperSystems/SignalProtocolKit.git SignalServiceKit: - :branch: charlesmchen/webrtcByDefault :git: https://github.com/WhisperSystems/SignalServiceKit.git SocketRocket: :git: https://github.com/facebook/SocketRocket.git @@ -141,7 +140,7 @@ CHECKOUT OPTIONS: :commit: a3c843cc8a423c5924c663490978f81dba34d04e :git: https://github.com/WhisperSystems/SignalProtocolKit.git SignalServiceKit: - :commit: f1b71ea64b80c370b28b00f0d53fd5f9d49601d8 + :commit: 286f72d273a12fe859317568e264891e450fe72b :git: https://github.com/WhisperSystems/SignalServiceKit.git SocketRocket: :commit: 877ac7438be3ad0b45ef5ca3969574e4b97112bf @@ -173,6 +172,6 @@ SPEC CHECKSUMS: YapDatabase: b1e43555a34a5298e23a045be96817a5ef0da58f ZXingObjC: bbf7b8f0cf8933fdd33eb4f9f46e22308552869b -PODFILE CHECKSUM: 473f742acb194322c317b63a1b5db6ca0864a0f1 +PODFILE CHECKSUM: 48dbf2fb380d626bb799a782dd41b6bf1e466506 COCOAPODS: 1.1.1