Skip to content

Commit 3fcf5e9

Browse files
chrisballingerchrisballinger
committed
Update dependencies
1 parent 1169253 commit 3fcf5e9

File tree

3 files changed

+50
-55
lines changed

3 files changed

+50
-55
lines changed

‎Cartfile.resolved‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
github "AFNetworking/AFNetworking" "3.2.1"
22
github "Mantle/Mantle" "db043e35dfe820a5f49e6aa59364bb85029903ab"
3-
github "PureLayout/PureLayout" "v3.0.2"
3+
github "PureLayout/PureLayout" "v3.1.2"
44
github "TTTAttributedLabel/TTTAttributedLabel" "2.0.0"
5-
github "TheLevelUp/ZXingObjC" "3.2.2"
5+
github "TheLevelUp/ZXingObjC" "3.5.0"
66
github "facebook/KVOController" "v1.2.0"
77
github "jdg/MBProgressHUD" "1.1.0"
88
github "mattt/FormatterKit" "1.8.2"
9-
github "nolanw/HTMLReader" "v2.1.2"
9+
github "nolanw/HTMLReader" "v2.1.3"
1010
github "soffes/SAMKeychain" "v1.5.3"
1111
github "xmartlabs/XLForm" "4.0.0"

‎Podfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ abstract_target 'ChatSecureCorePods' do
6262
pod 'gtm-oauth2', :podspec => 'Podspecs/gtm-oauth2.podspec'
6363

6464
# Storage
65-
# pod 'YapDatabase/SQLCipher', '~> 3.1.0'
66-
pod 'YapDatabase/SQLCipher', :git => 'https://github.com/ChatSecure/YapDatabase.git', :branch => 'nil-fixes'
65+
pod 'YapDatabase/SQLCipher', '~> 3.1'
66+
# pod 'YapDatabase/SQLCipher', :git => 'https://github.com/ChatSecure/YapDatabase.git', :branch => 'nil-fixes'
6767
pod 'libsqlfs/SQLCipher', :git => 'https://github.com/ChatSecure/libsqlfs.git', :branch => 'podspec-fix'
6868
pod 'IOCipher/GCDWebServer', :path => 'Submodules/IOCipher/IOCipher.podspec'
6969
pod 'YapTaskQueue/SQLCipher', :git => 'https://github.com/ChatSecure/YapTaskQueue.git', :branch => 'swift4'

‎Podfile.lock‎

Lines changed: 45 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
PODS:
2-
- Alamofire (4.7.2)
2+
- Alamofire (4.7.3)
33
- Appirater (2.3.1)
44
- ARChromeActivity (1.0.6)
55
- BBlock (1.2.1):
@@ -32,7 +32,7 @@ PODS:
3232
- gtm-http-fetcher (1.1)
3333
- gtm-oauth2 (1.1):
3434
- gtm-http-fetcher (~> 1.1)
35-
- HockeySDK-Source (5.1.2)
35+
- HockeySDK-Source (5.1.4)
3636
- IOCipher/common (0.1.0):
3737
- CocoaLumberjack
3838
- libsqlfs/SQLCipher
@@ -92,67 +92,67 @@ PODS:
9292
- XMPPFramework/Swift (4.0.0):
9393
- CocoaLumberjack/Swift
9494
- XMPPFramework/default
95-
- YapDatabase/SQLCipher (3.1):
96-
- YapDatabase/SQLCipher/Core (= 3.1)
97-
- YapDatabase/SQLCipher/Extensions (= 3.1)
98-
- YapDatabase/SQLCipher/Core (3.1):
95+
- YapDatabase/SQLCipher (3.1.1):
96+
- YapDatabase/SQLCipher/Core (= 3.1.1)
97+
- YapDatabase/SQLCipher/Extensions (= 3.1.1)
98+
- YapDatabase/SQLCipher/Core (3.1.1):
9999
- CocoaLumberjack
100100
- SQLCipher (>= 3.4.0)
101-
- YapDatabase/SQLCipher/Extensions (3.1):
101+
- YapDatabase/SQLCipher/Extensions (3.1.1):
102102
- YapDatabase/SQLCipher/Core
103-
- YapDatabase/SQLCipher/Extensions/ActionManager (= 3.1)
104-
- YapDatabase/SQLCipher/Extensions/AutoView (= 3.1)
105-
- YapDatabase/SQLCipher/Extensions/CloudCore (= 3.1)
106-
- YapDatabase/SQLCipher/Extensions/CloudKit (= 3.1)
107-
- YapDatabase/SQLCipher/Extensions/ConnectionPool (= 3.1)
108-
- YapDatabase/SQLCipher/Extensions/ConnectionProxy (= 3.1)
109-
- YapDatabase/SQLCipher/Extensions/CrossProcessNotification (= 3.1)
110-
- YapDatabase/SQLCipher/Extensions/FilteredView (= 3.1)
111-
- YapDatabase/SQLCipher/Extensions/FullTextSearch (= 3.1)
112-
- YapDatabase/SQLCipher/Extensions/Hooks (= 3.1)
113-
- YapDatabase/SQLCipher/Extensions/ManualView (= 3.1)
114-
- YapDatabase/SQLCipher/Extensions/Relationships (= 3.1)
115-
- YapDatabase/SQLCipher/Extensions/RTreeIndex (= 3.1)
116-
- YapDatabase/SQLCipher/Extensions/SearchResultsView (= 3.1)
117-
- YapDatabase/SQLCipher/Extensions/SecondaryIndex (= 3.1)
118-
- YapDatabase/SQLCipher/Extensions/View (= 3.1)
119-
- YapDatabase/SQLCipher/Extensions/ActionManager (3.1):
103+
- YapDatabase/SQLCipher/Extensions/ActionManager (= 3.1.1)
104+
- YapDatabase/SQLCipher/Extensions/AutoView (= 3.1.1)
105+
- YapDatabase/SQLCipher/Extensions/CloudCore (= 3.1.1)
106+
- YapDatabase/SQLCipher/Extensions/CloudKit (= 3.1.1)
107+
- YapDatabase/SQLCipher/Extensions/ConnectionPool (= 3.1.1)
108+
- YapDatabase/SQLCipher/Extensions/ConnectionProxy (= 3.1.1)
109+
- YapDatabase/SQLCipher/Extensions/CrossProcessNotification (= 3.1.1)
110+
- YapDatabase/SQLCipher/Extensions/FilteredView (= 3.1.1)
111+
- YapDatabase/SQLCipher/Extensions/FullTextSearch (= 3.1.1)
112+
- YapDatabase/SQLCipher/Extensions/Hooks (= 3.1.1)
113+
- YapDatabase/SQLCipher/Extensions/ManualView (= 3.1.1)
114+
- YapDatabase/SQLCipher/Extensions/Relationships (= 3.1.1)
115+
- YapDatabase/SQLCipher/Extensions/RTreeIndex (= 3.1.1)
116+
- YapDatabase/SQLCipher/Extensions/SearchResultsView (= 3.1.1)
117+
- YapDatabase/SQLCipher/Extensions/SecondaryIndex (= 3.1.1)
118+
- YapDatabase/SQLCipher/Extensions/View (= 3.1.1)
119+
- YapDatabase/SQLCipher/Extensions/ActionManager (3.1.1):
120120
- YapDatabase/SQLCipher/Core
121121
- YapDatabase/SQLCipher/Extensions/AutoView
122-
- YapDatabase/SQLCipher/Extensions/AutoView (3.1):
122+
- YapDatabase/SQLCipher/Extensions/AutoView (3.1.1):
123123
- YapDatabase/SQLCipher/Core
124124
- YapDatabase/SQLCipher/Extensions/View
125-
- YapDatabase/SQLCipher/Extensions/CloudCore (3.1):
125+
- YapDatabase/SQLCipher/Extensions/CloudCore (3.1.1):
126126
- YapDatabase/SQLCipher/Core
127-
- YapDatabase/SQLCipher/Extensions/CloudKit (3.1):
127+
- YapDatabase/SQLCipher/Extensions/CloudKit (3.1.1):
128128
- YapDatabase/SQLCipher/Core
129-
- YapDatabase/SQLCipher/Extensions/ConnectionPool (3.1):
129+
- YapDatabase/SQLCipher/Extensions/ConnectionPool (3.1.1):
130130
- YapDatabase/SQLCipher/Core
131-
- YapDatabase/SQLCipher/Extensions/ConnectionProxy (3.1):
131+
- YapDatabase/SQLCipher/Extensions/ConnectionProxy (3.1.1):
132132
- YapDatabase/SQLCipher/Core
133-
- YapDatabase/SQLCipher/Extensions/CrossProcessNotification (3.1):
133+
- YapDatabase/SQLCipher/Extensions/CrossProcessNotification (3.1.1):
134134
- YapDatabase/SQLCipher/Core
135-
- YapDatabase/SQLCipher/Extensions/FilteredView (3.1):
135+
- YapDatabase/SQLCipher/Extensions/FilteredView (3.1.1):
136136
- YapDatabase/SQLCipher/Core
137137
- YapDatabase/SQLCipher/Extensions/View
138-
- YapDatabase/SQLCipher/Extensions/FullTextSearch (3.1):
138+
- YapDatabase/SQLCipher/Extensions/FullTextSearch (3.1.1):
139139
- YapDatabase/SQLCipher/Core
140-
- YapDatabase/SQLCipher/Extensions/Hooks (3.1):
140+
- YapDatabase/SQLCipher/Extensions/Hooks (3.1.1):
141141
- YapDatabase/SQLCipher/Core
142-
- YapDatabase/SQLCipher/Extensions/ManualView (3.1):
142+
- YapDatabase/SQLCipher/Extensions/ManualView (3.1.1):
143143
- YapDatabase/SQLCipher/Core
144144
- YapDatabase/SQLCipher/Extensions/View
145-
- YapDatabase/SQLCipher/Extensions/Relationships (3.1):
145+
- YapDatabase/SQLCipher/Extensions/Relationships (3.1.1):
146146
- YapDatabase/SQLCipher/Core
147-
- YapDatabase/SQLCipher/Extensions/RTreeIndex (3.1):
147+
- YapDatabase/SQLCipher/Extensions/RTreeIndex (3.1.1):
148148
- YapDatabase/SQLCipher/Core
149-
- YapDatabase/SQLCipher/Extensions/SearchResultsView (3.1):
149+
- YapDatabase/SQLCipher/Extensions/SearchResultsView (3.1.1):
150150
- YapDatabase/SQLCipher/Core
151151
- YapDatabase/SQLCipher/Extensions/AutoView
152152
- YapDatabase/SQLCipher/Extensions/FullTextSearch
153-
- YapDatabase/SQLCipher/Extensions/SecondaryIndex (3.1):
153+
- YapDatabase/SQLCipher/Extensions/SecondaryIndex (3.1.1):
154154
- YapDatabase/SQLCipher/Core
155-
- YapDatabase/SQLCipher/Extensions/View (3.1):
155+
- YapDatabase/SQLCipher/Extensions/View (3.1.1):
156156
- YapDatabase/SQLCipher/Core
157157
- YapTaskQueue/SQLCipher (0.3.0):
158158
- YapDatabase/SQLCipher (~> 3.0)
@@ -187,7 +187,7 @@ DEPENDENCIES:
187187
- SignalProtocolObjC (from `Submodules/SignalProtocol-ObjC/SignalProtocolObjC.podspec`)
188188
- TUSafariActivity (~> 1.0)
189189
- XMPPFramework/Swift (from `Submodules/XMPPFramework/XMPPFramework.podspec`)
190-
- YapDatabase/SQLCipher (from `https://github.com/ChatSecure/YapDatabase.git`, branch `nil-fixes`)
190+
- YapDatabase/SQLCipher (~> 3.1)
191191
- YapTaskQueue/SQLCipher (from `https://github.com/ChatSecure/YapTaskQueue.git`, branch `swift4`)
192192

193193
SPEC REPOS:
@@ -215,6 +215,7 @@ SPEC REPOS:
215215
- SignalProtocolC
216216
- SQLCipher
217217
- TUSafariActivity
218+
- YapDatabase
218219

219220
EXTERNAL SOURCES:
220221
ChatSecure-Push-iOS:
@@ -243,9 +244,6 @@ EXTERNAL SOURCES:
243244
:path: Submodules/SignalProtocol-ObjC/SignalProtocolObjC.podspec
244245
XMPPFramework:
245246
:path: Submodules/XMPPFramework/XMPPFramework.podspec
246-
YapDatabase:
247-
:branch: nil-fixes
248-
:git: https://github.com/ChatSecure/YapDatabase.git
249247
YapTaskQueue:
250248
:branch: swift4
251249
:git: https://github.com/ChatSecure/YapTaskQueue.git
@@ -257,15 +255,12 @@ CHECKOUT OPTIONS:
257255
ParkedTextField:
258256
:commit: 43f1d3b
259257
:git: https://github.com/gmertk/ParkedTextField.git
260-
YapDatabase:
261-
:commit: 51263d14572eaf80de14e5dc47b3dd517c5357af
262-
:git: https://github.com/ChatSecure/YapDatabase.git
263258
YapTaskQueue:
264259
:commit: fb0716626af841b573ff752b9bd064d26d3fda96
265260
:git: https://github.com/ChatSecure/YapTaskQueue.git
266261

267262
SPEC CHECKSUMS:
268-
Alamofire: e4fa87002c137ba2d8d634d2c51fabcda0d5c223
263+
Alamofire: c7287b6e5d7da964a70935e5db17046b7fde6568
269264
Appirater: 44a4651f7912a17dc906b655f0c215d5bb768b84
270265
ARChromeActivity: 5dcf9b9f09323761f992aff3525cdd777f83609d
271266
BBlock: c56d7f72597ffe1634fcdc73836c5c0fed3271be
@@ -278,7 +273,7 @@ SPEC CHECKSUMS:
278273
GCDWebServer: 8d67ee9f634b4bb91eb4b8aee440318a5fc6debd
279274
gtm-http-fetcher: 4e7de79fc9e774b291eae66a240f17b3a5277ec7
280275
gtm-oauth2: 05f40d662527bf1f71dc878da1c585ba67547e74
281-
HockeySDK-Source: 0e72e55e35cec26eaba207ec212fd1870961798a
276+
HockeySDK-Source: ebf3378833f457fa08aa452352b105dc21bfebcb
282277
IOCipher: 3b86ccd68b08ee73b3de80c24a10de130269698c
283278
JSQMessagesViewController: bc44afc60cca8c9e0fb127243d57551013e1f319
284279
JTSImageViewController: 1f8ce1cc93dab0d0af8e53badeea7528560cfec9
@@ -300,9 +295,9 @@ SPEC CHECKSUMS:
300295
SQLCipher: f9fcf29b2e59ced7defc2a2bdd0ebe79b40d4990
301296
TUSafariActivity: afc55a00965377939107ce4fdc7f951f62454546
302297
XMPPFramework: 42441b450fa312d8f6d8386ca1d371b31a881d1b
303-
YapDatabase: 170882ac5926507a4ea6dddaf704ebdd3f1ec61c
298+
YapDatabase: b418a4baa6906e8028748938f9159807fd039af4
304299
YapTaskQueue: f3b23875bead71a7ee57b65637ce9c0e98b68c34
305300

306-
PODFILE CHECKSUM: 10cf1d59d64df4aeb99712f08151595e50e89f1d
301+
PODFILE CHECKSUM: ec72f25d8bd9341e02bc3c04c158d348bf4675d8
307302

308303
COCOAPODS: 1.5.3

0 commit comments

Comments
 (0)