Move compatible dependencies to Carthage

.gitmodules

@@ -25,3 +25,6 @@
 [submodule "Submodules/JSQMessagesViewController"]
 	path = Submodules/JSQMessagesViewController
 	url = git@github.com:ChatSecure/JSQMessagesViewController.git
+[submodule "Submodules/SignalProtocol-ObjC"]
+	path = Submodules/SignalProtocol-ObjC
+	url = git@github.com:ChatSecure/SignalProtocol-ObjC.git

.travis.yml

@@ -16,7 +16,6 @@ before_install:
   - sed -i -e 's/git@github.com:/git:\/\/github.com\//' .gitmodules
   - sed -i -e 's/git@github.com:/git:\/\/github.com\//' Podfile
   - git submodule update --init --recursive
-  - carthage bootstrap --no-use-binaries --no-build --use-submodules --platform ios
 
 install:
   - cp OTRResources/Secrets-template.plist OTRResources/Secrets.plist
@@ -30,6 +29,7 @@ install:
   - unzip -q ./ChatSecure-iOS-Precompiled-Dependencies/Pods.zip
 
 before_script:
+  - carthage update --platform ios --cache-builds
   - bundle exec pod repo update
   - bundle exec pod install
 script:

Cartfile

@@ -5,7 +5,6 @@ github "AFNetworking/AFNetworking" ~> 3.1
 github "TheLevelUp/ZXingObjC" ~> 3.2
 github "soffes/SAMKeychain" ~> 1.5
 github "jdg/MBProgressHUD" ~> 1.0
-github "jverdi/JVFloatLabeledTextField" ~> 1.1
 github "TTTAttributedLabel/TTTAttributedLabel" ~> 2.0
 github "PureLayout/PureLayout" ~> 3.0
 github "uservoice/uservoice-ios-sdk" ~> 3.2

Cartfile.resolved

@@ -1,5 +1,13 @@
-github "Alamofire/Alamofire" "4.4.0"
-github "ChatSecure/HTMLReader" "808c2ebedc8b044eefc7a46c2dfca593244922e1"
+github "AFNetworking/AFNetworking" "3.1.0"
+github "Alamofire/Alamofire" "4.5.0"
 github "ChatSecure/Mantle" "4c1a09cb0c0811956cd35262340e42b940971cbb"
-github "ChatSecure/SignalProtocol-ObjC" "c9c7c1e55c752f823f81c45cfbde2eb351843449"
-github "ChatSecure/SignalProtocolC" "4335dfb70f6eb036c409cea59ebc778f4d734c16"
+github "PureLayout/PureLayout" "v3.0.2"
+github "TTTAttributedLabel/TTTAttributedLabel" "2.0.0"
+github "TheLevelUp/ZXingObjC" "3.2.1"
+github "facebook/KVOController" "v1.2.0"
+github "jdg/MBProgressHUD" "1.0.0"
+github "mattt/FormatterKit" "1.8.2"
+github "nolanw/HTMLReader" "1d0dda3849ff719fa15a0c4cac0118c70ef2217c"
+github "soffes/SAMKeychain" "v1.5.2"
+github "uservoice/uservoice-ios-sdk" "3.2.9"
+github "xmartlabs/XLForm" "3.3.0"

ChatSecure.xcodeproj/xcshareddata/xcschemes/ChatSecure.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0830"
+   LastUpgradeVersion = "0900"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

ChatSecure.xcodeproj/xcshareddata/xcschemes/ChatSecureCore.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0830"
+   LastUpgradeVersion = "0900"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

ChatSecure.xcodeproj/xcshareddata/xcschemes/ChatSecureTests.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0830"
+   LastUpgradeVersion = "0900"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

ChatSecure.xcodeproj/xcshareddata/xcschemes/ChatSecureUITests.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0830"
+   LastUpgradeVersion = "0900"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

ChatSecure/Classes/View Controllers/MaybeLaterViewController.swift

@@ -8,7 +8,7 @@
 
 import UIKit
 import OTRAssets
-import uservoice_iphone_sdk
+import UserVoice
 import Appirater
 
 public class MaybeLaterViewController: UIViewController {

ChatSecure/Classes/View Controllers/OTRSettingsViewController.m

@@ -29,7 +29,7 @@
 #import "OTRQRCodeViewController.h"
 @import QuartzCore;
 #import "OTRConstants.h"
-@import uservoice_iphone_sdk;
+@import UserVoice;
 #import "OTRAccountTableViewCell.h"
 #import "UIActionSheet+ChatSecure.h"
 #import "OTRSecrets.h"

ChatSecure/Classes/View Controllers/PurchaseViewController.swift

@@ -12,6 +12,17 @@ import FormatterKit
 import MBProgressHUD
 import OTRAssets
 
+extension Bundle {
+    static var formatterKit: Bundle? {
+        let framework = Bundle(for: TTTUnitOfInformationFormatter.self)
+        guard let path = framework.path(forResource: "FormatterKit", ofType: "bundle") else {
+            return nil
+        }
+        let bundle = Bundle(path: path)
+        return bundle
+    }
+}
+
 public class PurchaseViewController: UIViewController {
     @IBOutlet weak var bigMoneyButton: UIButton!
     @IBOutlet weak var smallMoneyButton: UIButton!
@@ -94,7 +105,10 @@ public class PurchaseViewController: UIViewController {
             }
             button.isEnabled = true
             let price = product.formattedPrice ?? product.price.stringValue
-            let duration = NSLocalizedString("mo", tableName: "FormatterKit", bundle: Bundle.formatterKit(), value: "mo", comment: "Month")
+            var duration = "mo"
+            if let bundle = Bundle.formatterKit {
+                duration = NSLocalizedString("mo", tableName: "FormatterKit", bundle: bundle, value: "mo", comment: "Month")
+            }
             let fullPrice = "\(productEnum.emoji) \(price)/\(duration)"
             button.setTitle(fullPrice, for: .normal)
             button.titleLabel?.adjustsFontSizeToFitWidth = true

ChatSecure/Resources/Images.xcassets/AppIcon.appiconset/Contents.json

@@ -124,6 +124,11 @@
       "idiom" : "ipad",
       "filename" : "iPadProIcon@2x.png",
       "scale" : "2x"
+    },
+    {
+      "idiom" : "ios-marketing",
+      "size" : "1024x1024",
+      "scale" : "1x"
     }
   ],
   "info" : {

OTRResources/Interface/HTMLPreviewView.xib

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12120" systemVersion="16F73" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13122.17" systemVersion="16F2073" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12088"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13104.14"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>

Podfile

@@ -55,7 +55,7 @@ abstract_target 'ChatSecureCorePods' do
   pod 'YapTaskQueue/SQLCipher', :git => 'https://github.com/ChatSecure/YapTaskQueue.git', :branch => 'yap3'
 
   # Crypto
-  pod 'SignalProtocolObjC', :path => 'Submodules/SignalProtocol-ObjC/SignalProtocolObjC.podspec'
+  pod 'SignalProtocolObjC', :path => 'Submodules/SignalProtocolObjC/SignalProtocolObjC.podspec'
   pod 'OTRKit', :path => 'Submodules/OTRKit/OTRKit.podspec'
 
   ### Moved to Carthage ###