diff --git a/Podfile b/Podfile index 28074881f..526421c56 100644 --- a/Podfile +++ b/Podfile @@ -3,8 +3,8 @@ source 'https://github.com/CocoaPods/Specs.git' 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 'AxolotlKit', git: 'https://github.com/WhisperSystems/SignalProtocolKit.git' + #pod 'AxolotlKit', path: '../SignalProtocolKit' pod 'SignalServiceKit', git: 'https://github.com/WhisperSystems/SignalServiceKit.git' #pod 'SignalServiceKit', path: '../SignalServiceKit' pod 'OpenSSL' diff --git a/Podfile.lock b/Podfile.lock index 19e23c235..1e9f14f7f 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -110,7 +110,7 @@ PODS: - YapDatabase/SQLCipher/Core DEPENDENCIES: - - AxolotlKit (from `../SignalProtocolKit`) + - AxolotlKit (from `https://github.com/WhisperSystems/SignalProtocolKit.git`) - JSQMessagesViewController (from `https://github.com/WhisperSystems/JSQMessagesViewController.git`, branch `mkirk/position-edit-menu`) - OpenSSL - PureLayout @@ -119,7 +119,7 @@ DEPENDENCIES: EXTERNAL SOURCES: AxolotlKit: - :path: ../SignalProtocolKit + :git: https://github.com/WhisperSystems/SignalProtocolKit.git JSQMessagesViewController: :branch: mkirk/position-edit-menu :git: https://github.com/WhisperSystems/JSQMessagesViewController.git @@ -129,6 +129,9 @@ EXTERNAL SOURCES: :git: https://github.com/facebook/SocketRocket.git CHECKOUT OPTIONS: + AxolotlKit: + :commit: bce663486ac34c70594deae8260b3cd29dd086e9 + :git: https://github.com/WhisperSystems/SignalProtocolKit.git JSQMessagesViewController: :commit: 7054e4b13ee5bcd6d524adb6dc9a726e8c466308 :git: https://github.com/WhisperSystems/JSQMessagesViewController.git @@ -161,6 +164,6 @@ SPEC CHECKSUMS: UnionFind: c33be5adb12983981d6e827ea94fc7f9e370f52d YapDatabase: b1e43555a34a5298e23a045be96817a5ef0da58f -PODFILE CHECKSUM: 0721fb3284091003c6f90b9e4e1143ccd7f57701 +PODFILE CHECKSUM: 549de6756fe8eab98647be8561b3988361f62e85 COCOAPODS: 1.2.1