Fix compilation issue with Mantle and tests

Podfile

@@ -62,6 +62,7 @@ abstract_target 'ChatSecureCorePods' do
   pod 'SQLCipher', '~> 3.4'
   # Version 3.1.2 breaks YapTaskQueue 0.3.0
   pod 'YapDatabase/SQLCipher', '3.1.1'
+  pod 'Mantle', :podspec => 'Podspecs/Mantle.podspec.json'
 
   # The upstream 1.3.2 has a regression https://github.com/ChatSecure/ChatSecure-iOS/issues/1075
   pod 'libsqlfs/SQLCipher', :git => 'https://github.com/ChatSecure/libsqlfs.git', :branch => '1.3.2-chatsecure'
@@ -75,6 +76,7 @@ abstract_target 'ChatSecureCorePods' do
   pod 'Alamofire', '~> 4.4'
   pod 'Kvitto', '~> 1.0'
 
+
   pod 'ChatSecureCore', :path => 'ChatSecureCore.podspec'
   pod 'OTRAssets', :path => 'OTRAssets.podspec'
 

Podfile.lock

@@ -275,6 +275,7 @@ DEPENDENCIES:
   - libsqlfs/SQLCipher (from `https://github.com/ChatSecure/libsqlfs.git`, branch `1.3.2-chatsecure`)
   - LicensePlist
   - LumberjackConsole (from `Submodules/LumberjackConsole/LumberjackConsole.podspec`)
+  - Mantle (from `Podspecs/Mantle.podspec.json`)
   - MWFeedParser (~> 1.0)
   - Navajo (~> 0.0)
   - OpenInChrome (~> 0.0)
@@ -311,7 +312,6 @@ SPEC REPOS:
     - KVOController
     - libidn
     - LicensePlist
-    - Mantle
     - MBProgressHUD
     - MWFeedParser
     - Navajo
@@ -345,6 +345,8 @@ EXTERNAL SOURCES:
     :git: https://github.com/ChatSecure/libsqlfs.git
   LumberjackConsole:
     :path: Submodules/LumberjackConsole/LumberjackConsole.podspec
+  Mantle:
+    :podspec: Podspecs/Mantle.podspec.json
   OTRAssets:
     :path: OTRAssets.podspec
   OTRKit:
@@ -364,6 +366,9 @@ CHECKOUT OPTIONS:
   libsqlfs:
     :commit: 36b9d6a56a5918be3a97695063ca32dbf963e887
     :git: https://github.com/ChatSecure/libsqlfs.git
+  Mantle:
+    :commit: 4c1a09cb0c0811956cd35262340e42b940971cbb
+    :git: https://github.com/ChatSecure/Mantle.git
   ParkedTextField:
     :commit: a3800e3
     :git: https://github.com/gmertk/ParkedTextField.git
@@ -398,7 +403,7 @@ SPEC CHECKSUMS:
   libsqlfs: b3c1be163c2fba6b041379cfa5861033783ddae9
   LicensePlist: e5f8f2e3465620e53ec4c669955a5a7d0692b9cb
   LumberjackConsole: 218fed8e807ba6ce0bedbba06b7b295dc0efaf0c
-  Mantle: 2fa750afa478cd625a94230fbf1c13462f29395b
+  Mantle: bdb09649c721dcefc53132f3767f6e40d4d47740
   MBProgressHUD: e7baa36a220447d8aeb12769bf0585582f3866d9
   MWFeedParser: 2cf646014c1baf6ad1b08c480b40a08180079247
   Navajo: 5fb68239b4e3af4610f31925bae1ca8e6bab8eaa
@@ -422,6 +427,6 @@ SPEC CHECKSUMS:
   YapTaskQueue: f3b23875bead71a7ee57b65637ce9c0e98b68c34
   ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb
 
-PODFILE CHECKSUM: c661dd5d6c82aba164941a70b743ab9cc4ca6738
+PODFILE CHECKSUM: 1edbdd4df4b608092c945f89114a6e69f95b66e1
 
 COCOAPODS: 1.7.0

Podspecs/Mantle.podspec.json

@@ -0,0 +1,30 @@
+{
+  "name": "Mantle",
+  "version": "2.1.0",
+  "summary": "Model framework for Cocoa and Cocoa Touch.",
+  "homepage": "https://github.com/Mantle/Mantle",
+  "license": "MIT",
+  "authors": {
+    "Github": "support@github.com"
+  },
+  "source": {
+    "git": "https://github.com/ChatSecure/Mantle.git",
+    "branch": "2.1.0_headerfix"
+  },
+  "platforms": {
+    "ios": "5.0",
+    "osx": "10.7",
+    "watchos": "2.0",
+    "tvos": "9.0"
+  },
+  "requires_arc": true,
+  "frameworks": "Foundation",
+  "source_files": "Mantle",
+  "subspecs": [
+    {
+      "name": "extobjc",
+      "source_files": "Mantle/extobjc",
+      "private_header_files": "Mantle/extobjc/*.h"
+    }
+  ]
+}