Skip to content

Commit ee29fff

Browse files
committed
[SSK] Default to blocking changed Safety Numbers
// FREEBIE
1 parent eb995cb commit ee29fff

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ before_install:
1111
- brew outdated xctool || brew upgrade xctool # only upgrade if outdated (saves 2 minutes)
1212
- gem install cocoapods # get the latest cocoapods
1313
- gem install xcpretty
14-
- pod repo update --silent # log output is too long without --silent
14+
- travis_wait 20 pod repo update --silent # log output is too long without --silent
1515

1616
install: travis_wait 30 pod install # OpenSSL takes a long time to compile
1717

Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ source 'https://github.com/CocoaPods/Specs.git'
33

44
target 'Signal' do
55
pod 'SocketRocket', :git => 'https://github.com/facebook/SocketRocket.git'
6-
pod 'SignalServiceKit', git: 'https://github.com/WhisperSystems/SignalServiceKit.git'
6+
pod 'SignalServiceKit', git: 'https://github.com/WhisperSystems/SignalServiceKit.git', branch: 'mkirk/default-to-blocking-sn'
77
#pod 'SignalServiceKit', path: '../SignalServiceKit'
88
pod 'OpenSSL'
99
pod 'PastelogKit', '~> 1.3'

Podfile.lock

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ DEPENDENCIES:
122122
- OpenSSL
123123
- PastelogKit (~> 1.3)
124124
- SCWaveformView (~> 1.0)
125-
- SignalServiceKit (from `https://github.com/WhisperSystems/SignalServiceKit.git`)
125+
- SignalServiceKit (from `https://github.com/WhisperSystems/SignalServiceKit.git`, branch `mkirk/default-to-blocking-sn`)
126126
- SocketRocket (from `https://github.com/facebook/SocketRocket.git`)
127127
- ZXingObjC
128128

@@ -131,6 +131,7 @@ EXTERNAL SOURCES:
131131
:branch: fix-intermittent-crash-on-delete
132132
:git: https://github.com/WhisperSystems/JSQMessagesViewController.git
133133
SignalServiceKit:
134+
:branch: mkirk/default-to-blocking-sn
134135
:git: https://github.com/WhisperSystems/SignalServiceKit.git
135136
SocketRocket:
136137
:git: https://github.com/facebook/SocketRocket.git
@@ -140,7 +141,7 @@ CHECKOUT OPTIONS:
140141
:commit: 03cde781234ade464dd26914d87e6e95afde1119
141142
:git: https://github.com/WhisperSystems/JSQMessagesViewController.git
142143
SignalServiceKit:
143-
:commit: 60a39f93c6d86cde883e5e798b79db19f1d46636
144+
:commit: e53422f76582439ebd6b3fac54a3787c7e5c6a7b
144145
:git: https://github.com/WhisperSystems/SignalServiceKit.git
145146
SocketRocket:
146147
:commit: 41b57bb2fc292a814f758441a05243eb38457027
@@ -172,6 +173,6 @@ SPEC CHECKSUMS:
172173
YapDatabase: b1e43555a34a5298e23a045be96817a5ef0da58f
173174
ZXingObjC: bf15b3814f7a105b6d99f47da2333c93a063650a
174175

175-
PODFILE CHECKSUM: 0e619684d8a5fa1ddbab78c0821d74af558fd7df
176+
PODFILE CHECKSUM: 9dd2ff3f84dd29f6437914f7ab631aeb84003078
176177

177178
COCOAPODS: 1.0.1

0 commit comments

Comments
 (0)