From 3b687da0ec01a4b1d8f1c66e0ea27c59432318a9 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Tue, 27 Sep 2016 23:39:18 -0400 Subject: [PATCH] Upgrade SSK to setup db async where possible fixes #1358 // FREEBIE --- Podfile | 2 +- Podfile.lock | 7 ++++--- Signal/Signal-Info.plist | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Podfile b/Podfile index 6e57ae933..c403ba87a 100644 --- a/Podfile +++ b/Podfile @@ -3,7 +3,7 @@ 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' + pod 'SignalServiceKit', git: 'https://github.com/WhisperSystems/SignalServiceKit.git', branch: 'mkirk/async-db-setup' #pod 'SignalServiceKit', path: '../SignalServiceKit' pod 'OpenSSL', '~> 1.0.208' pod 'PastelogKit', '~> 1.3' diff --git a/Podfile.lock b/Podfile.lock index e1aac95fd..4e79de0b8 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -119,18 +119,19 @@ DEPENDENCIES: - OpenSSL (~> 1.0.208) - PastelogKit (~> 1.3) - SCWaveformView (~> 1.0) - - SignalServiceKit (from `https://github.com/WhisperSystems/SignalServiceKit.git`) + - SignalServiceKit (from `https://github.com/WhisperSystems/SignalServiceKit.git`, branch `mkirk/async-db-setup`) - SocketRocket (from `https://github.com/facebook/SocketRocket.git`) EXTERNAL SOURCES: SignalServiceKit: + :branch: mkirk/async-db-setup :git: https://github.com/WhisperSystems/SignalServiceKit.git SocketRocket: :git: https://github.com/facebook/SocketRocket.git CHECKOUT OPTIONS: SignalServiceKit: - :commit: 06538f6b46fae7ec8a73deab4c186bfde28bbb49 + :commit: d06455fe2b3af5c072be3437a55d78eb6a5d540f :git: https://github.com/WhisperSystems/SignalServiceKit.git SocketRocket: :commit: 8096fef47d582bff8ae3758c9ae7af1d55ea53d6 @@ -161,6 +162,6 @@ SPEC CHECKSUMS: UnionFind: c33be5adb12983981d6e827ea94fc7f9e370f52d YapDatabase: b1e43555a34a5298e23a045be96817a5ef0da58f -PODFILE CHECKSUM: 5dccee4c1c1ba5d4bf9575a81eeede82d1e89e8b +PODFILE CHECKSUM: e5ab6db291fd21f96ab3767fbf468988b9c916c7 COCOAPODS: 1.0.1 diff --git a/Signal/Signal-Info.plist b/Signal/Signal-Info.plist index 25023fcdc..0de6523aa 100644 --- a/Signal/Signal-Info.plist +++ b/Signal/Signal-Info.plist @@ -21,7 +21,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 2.5.2 + 2.5.3 CFBundleSignature ???? CFBundleURLTypes @@ -38,7 +38,7 @@ CFBundleVersion - 2.5.2.2 + 2.5.3.0 ITSAppUsesNonExemptEncryption LOGS_EMAIL