Bug 1223400 - Amend project to use carthage built dynamic frameworks

Part 1 - replace ThirdParty packages that are Carthage compliant to Carthage
Part 2 - remove non-carthage compliant packages out of carthage and into ThirdParty
Part 3 - Pin Carthage dependencies to specific versions
Part 4 - Move dependencies that were forked for build reasons back to original repos
Part 5 - Move project away from subprojects and included code to linking to carthage built dynamic frameworks
Part 6 - Update checkout and update scripts to use carthage correctly
Part 7 - create carthage,sh script to ensure that carthage is in the right state for setup and call from checkout.sh and update.sh to call carthage.sh before executing carthage commands

Author: Emily Toop

Account/FirefoxAccount.swift

@@ -5,6 +5,7 @@
 import Foundation
 import Shared
 import XCGLogger
+import Deferred
 
 private let log = Logger.syncLogger
 

Account/FxAClient10.swift

@@ -6,6 +6,7 @@ import Alamofire
 import Shared
 import Foundation
 import FxA
+import Deferred
 
 public let FxAClientErrorDomain = "org.mozilla.fxa.error"
 public let FxAClientUnknownError = NSError(domain: FxAClientErrorDomain, code: 999,

Account/FxALoginStateMachine.swift

@@ -6,6 +6,7 @@ import Foundation
 import FxA
 import Shared
 import XCGLogger
+import Deferred
 
 // TODO: log to an FxA-only, persistent log file.
 private let log = Logger.syncLogger

Account/SyncAuthState.swift

@@ -5,6 +5,7 @@
 import Foundation
 import Shared
 import XCGLogger
+import Deferred
 
 private let CurrentSyncAuthStateCacheVersion = 1
 

Account/TokenServerClient.swift

@@ -5,6 +5,7 @@
 import Alamofire
 import Shared
 import Foundation
+import Deferred
 
 let TokenServerClientErrorDomain = "org.mozilla.token.error"
 let TokenServerClientUnknownError = TokenServerError.Local(

AccountTests/FxAClient10Tests.swift

@@ -6,6 +6,7 @@
 import FxA
 import Shared
 import UIKit
+import Deferred
 
 import XCTest
 

AccountTests/FxALoginStateMachineTests.swift

@@ -6,6 +6,7 @@
 import Foundation
 import FxA
 import Shared
+import Deferred
 
 import XCTest
 

AccountTests/LiveAccountTest.swift

@@ -6,6 +6,7 @@
 import Foundation
 import FxA
 import Shared
+import Deferred
 
 import XCTest
 

Cartfile

@@ -1,16 +1,14 @@
-github "fluffyemily/Alamofire"      "alamofire-ios-only"
+github "Alamofire/Alamofire"      	"2.0.2"
 github "mozilla/Base32"             "swift-2.0"        # So we don't have to tag a release for Emily's fixes.
-github "mozilla/Deferred"           "master"           # Making Deferred extensible in swift 2.0
-github "swisspol/GCDWebServer"                         # Implicit: latest tag.
-github "kif-framework/KIF"          "master"
-github "ZaBlanc/RaptureXML"         "master"
+github "mozilla/Deferred"           "2.0.1"           # Making Deferred extensible in swift 2.0
+github "swisspol/GCDWebServer"		"3.3.2"			     
+github "kif-framework/KIF"          "v3.3.2"
 github "mozilla/readability"        "master"
-github "rs/SDWebImage"              "master"           # To get the fix for libwebp
+github "rs/SDWebImage"              "3.7.4"           
 github "SnapKit/SnapKit"            "0.18.0"
-github "st3fan/SQLite.swift"        "swift-2"
-github "CEWendel/SWTableViewCell"                      # Implicit: latest tag.
-github "st3fan/SWXMLHash"           "xcode-7.0"        # So we get Swift 2.0 fixes.
-github "DaveWoodCom/XCGLogger"      "Version_3.2"
-github "sleroux/google-breakpad-ios" "master"
-github "adjust/ios_sdk"             "v4.3.0"
+github "drmohundro/SWXMLHash"       "2.0.0"            # So we get Swift 2.0 fixes.
+github "DaveWoodCom/XCGLogger"      "Version_3.2"        # Previously: swift_1.2
+github "fluffyemily/google-breakpad-ios" "carthageise-breakpad"
+github "adjust/ios_sdk"             "v4.5.0"
 github "AgileBits/onepassword-extension" "add-framework-support"
+github "fluffyemily/SwiftKeychainWrapper" "extension-compatibility"					# default to latest tag

Cartfile.resolved

@@ -1,16 +1,14 @@
-github "fluffyemily/Alamofire" "6d0e3eb51d0999027e9cc3dd638c8310ef97b5a6"
+github "Alamofire/Alamofire" "2.0.2"
 github "mozilla/Base32" "d2136486487a77336ae18b1bd2f9a3f689ec44e5"
-github "mozilla/Deferred" "f3d9a179cfa96a0d9b82dd575c95c29c026248bd"
-github "swisspol/GCDWebServer" "ae88198f2001226ef6d7b7a0b53cb42078ff910c"
-github "kif-framework/KIF" "5ab1d0f9288d8bb74c0e97e0e1aed0dd7771264e"
-github "ZaBlanc/RaptureXML" "76b59ec0abf68c06d27cc027d7750b6a4da08650"
-github "rs/SDWebImage" "5a5c65d7996c09931a3384e86a8b96ff8f4ac5e7"
-github "st3fan/SQLite.swift" "eba69453871e2218c2e4f47c8fc5c650128378c4"
-github "CEWendel/SWTableViewCell" "0.3.7"
+github "mozilla/Deferred" "2.0.1"
+github "swisspol/GCDWebServer" "3.3.2"
+github "kif-framework/KIF" "v3.3.2"
+github "rs/SDWebImage" "3.7.4"
+github "drmohundro/SWXMLHash" "2.0.0"
 github "SnapKit/SnapKit" "0.18.0"
-github "st3fan/SWXMLHash" "eb9f966103e3006f45ae0ebd5258a62eb4b570b7"
-github "DaveWoodCom/XCGLogger" "b54b2f5aa5d8afa33bdccfdf50f05ac6bac889ff"
-github "sleroux/google-breakpad-ios" "30c54e9dead740960a3ec7a756aaaadf7a337933"
-github "mozilla/readability" "85101066386a0872526a6c4ae164c18fcd6cc1db"
-github "adjust/ios_sdk" "1a2c3f8c67d5b8e74bca9c5380f30419e6aee2a0"
-github "AgileBits/onepassword-extension" "1.6.4"
+github "fluffyemily/SwiftKeychainWrapper" "e3805fbdef595151f299b2b8c1b89760fc711395"
+github "DaveWoodCom/XCGLogger" "Version_3.2"
+github "fluffyemily/google-breakpad-ios" "da0576e03efe9e921f8ed08126d99c7fe6f75e8d"
+github "adjust/ios_sdk" "v4.5.0"
+github "AgileBits/onepassword-extension" "22d595de49f6f2ccd18d0087ef80a4b0c9311c13"
+github "mozilla/readability" "7be3ccb57e9f16bc8ce70257e762b3b6ee8961ed"