diff --git a/Podfile b/Podfile
index 9928bc2de..a5357a9cc 100644
--- a/Podfile
+++ b/Podfile
@@ -3,7 +3,8 @@ source 'https://github.com/CocoaPods/Specs.git'
target 'Signal' do
pod 'SocketRocket', :git => 'https://github.com/facebook/SocketRocket.git'
- pod 'SignalServiceKit', :git => 'https://github.com/WhisperSystems/SignalServiceKit.git', branch: 'dt'
+ pod 'SignalServiceKit', git: 'https://github.com/WhisperSystems/SignalServiceKit.git', branch: 'desktop-integration'
+ #pod 'SignalServiceKit', path: '../SignalServiceKit'
pod 'OpenSSL', '~> 1.0.208'
pod 'PastelogKit', '~> 1.3'
pod 'FFCircularProgressView', '~> 0.5'
diff --git a/Podfile.lock b/Podfile.lock
index d2d881cac..497660988 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -119,19 +119,19 @@ DEPENDENCIES:
- OpenSSL (~> 1.0.208)
- PastelogKit (~> 1.3)
- SCWaveformView (~> 1.0)
- - SignalServiceKit (from `https://github.com/WhisperSystems/SignalServiceKit.git`, branch `dt`)
+ - SignalServiceKit (from `https://github.com/WhisperSystems/SignalServiceKit.git`, branch `desktop-integration`)
- SocketRocket (from `https://github.com/facebook/SocketRocket.git`)
EXTERNAL SOURCES:
SignalServiceKit:
- :branch: dt
+ :branch: desktop-integration
:git: https://github.com/WhisperSystems/SignalServiceKit.git
SocketRocket:
:git: https://github.com/facebook/SocketRocket.git
CHECKOUT OPTIONS:
SignalServiceKit:
- :commit: 0933b921289ded4bb0761ce4176a2004aeab4dd5
+ :commit: eb96f846a4bb95e57da4ea946f6629b74fc9b423
:git: https://github.com/WhisperSystems/SignalServiceKit.git
SocketRocket:
:commit: 8096fef47d582bff8ae3758c9ae7af1d55ea53d6
@@ -162,6 +162,6 @@ SPEC CHECKSUMS:
UnionFind: c33be5adb12983981d6e827ea94fc7f9e370f52d
YapDatabase: b1e43555a34a5298e23a045be96817a5ef0da58f
-PODFILE CHECKSUM: bcac03a0ce180ba50c3467068062f8e55e11e778
+PODFILE CHECKSUM: 430c423130f22d8319fc2a420b55a4a3c7b39c9a
COCOAPODS: 1.0.1
diff --git a/Signal/Signal-Info.plist b/Signal/Signal-Info.plist
index d7c26624b..4a7bd7fed 100644
--- a/Signal/Signal-Info.plist
+++ b/Signal/Signal-Info.plist
@@ -38,7 +38,7 @@
CFBundleVersion
- 2.5.0.7
+ 2.5.0.8
ITSAppUsesNonExemptEncryption
LOGS_EMAIL