Skip to content

Commit 56ea40e

Browse files
Fix compilation issue with Mantle and tests
1 parent 71384d7 commit 56ea40e

File tree

3 files changed

+40
-3
lines changed

3 files changed

+40
-3
lines changed

Podfile

+2
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ abstract_target 'ChatSecureCorePods' do
6262
pod 'SQLCipher', '~> 3.4'
6363
# Version 3.1.2 breaks YapTaskQueue 0.3.0
6464
pod 'YapDatabase/SQLCipher', '3.1.1'
65+
pod 'Mantle', :podspec => 'Podspecs/Mantle.podspec.json'
6566

6667
# The upstream 1.3.2 has a regression https://github.com/ChatSecure/ChatSecure-iOS/issues/1075
6768
pod 'libsqlfs/SQLCipher', :git => 'https://github.com/ChatSecure/libsqlfs.git', :branch => '1.3.2-chatsecure'
@@ -75,6 +76,7 @@ abstract_target 'ChatSecureCorePods' do
7576
pod 'Alamofire', '~> 4.4'
7677
pod 'Kvitto', '~> 1.0'
7778

79+
7880
pod 'ChatSecureCore', :path => 'ChatSecureCore.podspec'
7981
pod 'OTRAssets', :path => 'OTRAssets.podspec'
8082

Podfile.lock

+8-3
Original file line numberDiff line numberDiff line change
@@ -275,6 +275,7 @@ DEPENDENCIES:
275275
- libsqlfs/SQLCipher (from `https://github.com/ChatSecure/libsqlfs.git`, branch `1.3.2-chatsecure`)
276276
- LicensePlist
277277
- LumberjackConsole (from `Submodules/LumberjackConsole/LumberjackConsole.podspec`)
278+
- Mantle (from `Podspecs/Mantle.podspec.json`)
278279
- MWFeedParser (~> 1.0)
279280
- Navajo (~> 0.0)
280281
- OpenInChrome (~> 0.0)
@@ -311,7 +312,6 @@ SPEC REPOS:
311312
- KVOController
312313
- libidn
313314
- LicensePlist
314-
- Mantle
315315
- MBProgressHUD
316316
- MWFeedParser
317317
- Navajo
@@ -345,6 +345,8 @@ EXTERNAL SOURCES:
345345
:git: https://github.com/ChatSecure/libsqlfs.git
346346
LumberjackConsole:
347347
:path: Submodules/LumberjackConsole/LumberjackConsole.podspec
348+
Mantle:
349+
:podspec: Podspecs/Mantle.podspec.json
348350
OTRAssets:
349351
:path: OTRAssets.podspec
350352
OTRKit:
@@ -364,6 +366,9 @@ CHECKOUT OPTIONS:
364366
libsqlfs:
365367
:commit: 36b9d6a56a5918be3a97695063ca32dbf963e887
366368
:git: https://github.com/ChatSecure/libsqlfs.git
369+
Mantle:
370+
:commit: 4c1a09cb0c0811956cd35262340e42b940971cbb
371+
:git: https://github.com/ChatSecure/Mantle.git
367372
ParkedTextField:
368373
:commit: a3800e3
369374
:git: https://github.com/gmertk/ParkedTextField.git
@@ -398,7 +403,7 @@ SPEC CHECKSUMS:
398403
libsqlfs: b3c1be163c2fba6b041379cfa5861033783ddae9
399404
LicensePlist: e5f8f2e3465620e53ec4c669955a5a7d0692b9cb
400405
LumberjackConsole: 218fed8e807ba6ce0bedbba06b7b295dc0efaf0c
401-
Mantle: 2fa750afa478cd625a94230fbf1c13462f29395b
406+
Mantle: bdb09649c721dcefc53132f3767f6e40d4d47740
402407
MBProgressHUD: e7baa36a220447d8aeb12769bf0585582f3866d9
403408
MWFeedParser: 2cf646014c1baf6ad1b08c480b40a08180079247
404409
Navajo: 5fb68239b4e3af4610f31925bae1ca8e6bab8eaa
@@ -422,6 +427,6 @@ SPEC CHECKSUMS:
422427
YapTaskQueue: f3b23875bead71a7ee57b65637ce9c0e98b68c34
423428
ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb
424429

425-
PODFILE CHECKSUM: c661dd5d6c82aba164941a70b743ab9cc4ca6738
430+
PODFILE CHECKSUM: 1edbdd4df4b608092c945f89114a6e69f95b66e1
426431

427432
COCOAPODS: 1.7.0

Podspecs/Mantle.podspec.json

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
{
2+
"name": "Mantle",
3+
"version": "2.1.0",
4+
"summary": "Model framework for Cocoa and Cocoa Touch.",
5+
"homepage": "https://github.com/Mantle/Mantle",
6+
"license": "MIT",
7+
"authors": {
8+
"Github": "[email protected]"
9+
},
10+
"source": {
11+
"git": "https://github.com/ChatSecure/Mantle.git",
12+
"branch": "2.1.0_headerfix"
13+
},
14+
"platforms": {
15+
"ios": "5.0",
16+
"osx": "10.7",
17+
"watchos": "2.0",
18+
"tvos": "9.0"
19+
},
20+
"requires_arc": true,
21+
"frameworks": "Foundation",
22+
"source_files": "Mantle",
23+
"subspecs": [
24+
{
25+
"name": "extobjc",
26+
"source_files": "Mantle/extobjc",
27+
"private_header_files": "Mantle/extobjc/*.h"
28+
}
29+
]
30+
}

0 commit comments

Comments
 (0)