From 1be49e485865cc672a1134c6bead2d556f732c2e Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 31 Aug 2017 16:36:21 -0400 Subject: [PATCH] Update JSQMessagesViewController pod. // FREEBIE --- Podfile | 4 ++-- Podfile.lock | 10 +++++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Podfile b/Podfile index 9f44466e1..070f1f1e2 100644 --- a/Podfile +++ b/Podfile @@ -5,8 +5,8 @@ target 'Signal' do pod 'ATAppUpdater' pod 'AxolotlKit', git: 'https://github.com/WhisperSystems/SignalProtocolKit.git' #pod 'AxolotlKit', path: '../SignalProtocolKit' - #pod 'JSQMessagesViewController', git: 'https://github.com/WhisperSystems/JSQMessagesViewController.git', branch: 'signal-master' - pod 'JSQMessagesViewController', path: '../JSQMessagesViewController' + pod 'JSQMessagesViewController', git: 'https://github.com/WhisperSystems/JSQMessagesViewController.git', branch: 'signal-master' + #pod 'JSQMessagesViewController', path: '../JSQMessagesViewController' pod 'PureLayout' pod 'OpenSSL', git: 'https://github.com/WhisperSystems/OpenSSL-Pod' pod 'Reachability' diff --git a/Podfile.lock b/Podfile.lock index 9cbb804ae..cc01232dc 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -114,7 +114,7 @@ PODS: DEPENDENCIES: - ATAppUpdater - AxolotlKit (from `https://github.com/WhisperSystems/SignalProtocolKit.git`) - - JSQMessagesViewController (from `../JSQMessagesViewController`) + - JSQMessagesViewController (from `https://github.com/WhisperSystems/JSQMessagesViewController.git`, branch `signal-master`) - OpenSSL (from `https://github.com/WhisperSystems/OpenSSL-Pod`) - PureLayout - Reachability @@ -125,7 +125,8 @@ EXTERNAL SOURCES: AxolotlKit: :git: https://github.com/WhisperSystems/SignalProtocolKit.git JSQMessagesViewController: - :path: ../JSQMessagesViewController + :branch: signal-master + :git: https://github.com/WhisperSystems/JSQMessagesViewController.git OpenSSL: :git: https://github.com/WhisperSystems/OpenSSL-Pod SignalServiceKit: @@ -137,6 +138,9 @@ CHECKOUT OPTIONS: AxolotlKit: :commit: 6e9d5e8c3dc87e397b4b7485172507b0990a22dd :git: https://github.com/WhisperSystems/SignalProtocolKit.git + JSQMessagesViewController: + :commit: f9063f634fc1e877eb85e4cf7b2bb5a246c41fcd + :git: https://github.com/WhisperSystems/JSQMessagesViewController.git OpenSSL: :commit: b2d3c149102032a09aefbfb470885db4aa83efad :git: https://github.com/WhisperSystems/OpenSSL-Pod @@ -167,6 +171,6 @@ SPEC CHECKSUMS: UnionFind: c33be5adb12983981d6e827ea94fc7f9e370f52d YapDatabase: cd911121580ff16675f65ad742a9eb0ab4d9e266 -PODFILE CHECKSUM: 4a6db311736b5ab36b660af813dcdf0af62da48c +PODFILE CHECKSUM: 2f847bb25e70d1d376f38cf21ae08624fa6ed67d COCOAPODS: 1.2.1