Merge pull request #2 from mobgen/develop

Merge version 2.4.0
mobgen · Mar 13, 2018 · 2e554a3 · 2e554a3
2 parents 7c5a564 + 651033c
commit 2e554a3
Show file tree

Hide file tree

Showing 248 changed files with 466 additions and 5,483 deletions.
diff --git a/Cartfile b/Cartfile
@@ -1,2 +1 @@
-github "mobgen/halo-ios" "2.2.4"
-github "facebook/facebook-sdk-swift"
+github "mobgen/halo-ios" "2.4.0"
diff --git a/Cartfile.private b/Cartfile.private
@@ -1,3 +1,3 @@
-github "Quick/Quick" "v1.0.0"
-github "Quick/Nimble" "v5.1.1"
-github "AliSoftware/OHHTTPStubs" "5.2.3-swift3"
+github "Quick/Quick" 
+github "Quick/Nimble" 
+github "AliSoftware/OHHTTPStubs"
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,7 +1,4 @@
-github "AliSoftware/OHHTTPStubs" "5.2.3-swift3"
-github "BoltsFramework/Bolts-ObjC" "1.8.4"
-github "Quick/Nimble" "v5.1.1"
-github "Quick/Quick" "v1.0.0"
-github "facebook/facebook-ios-sdk" "sdk-version-4.20.2"
-github "facebook/facebook-sdk-swift" "0.2.0"
-github "mobgen/halo-ios" "2.2.2"
+github "AliSoftware/OHHTTPStubs" "6.1.0"
+github "Quick/Nimble" "v7.0.3"
+github "Quick/Quick" "v1.2.0"
+github "mobgen/halo-ios" "2.4.0"
diff --git a/Facebook/Bolts.framework/Bolts b/Facebook/Bolts.framework/Bolts
diff --git a/Facebook/Bolts.framework/Headers/BFTask+Exceptions.h b/Facebook/Bolts.framework/Headers/BFTask+Exceptions.h
diff --git a/Facebook/Bolts.framework/Info.plist b/Facebook/Bolts.framework/Info.plist
diff --git a/Facebook/FBSDKCoreKit.framework/FBSDKCoreKit b/Facebook/FBSDKCoreKit.framework/FBSDKCoreKit
diff --git a/Facebook/FBSDKCoreKit.framework/Info.plist b/Facebook/FBSDKCoreKit.framework/Info.plist
diff --git a/Facebook/FBSDKLoginKit.framework/FBSDKLoginKit b/Facebook/FBSDKLoginKit.framework/FBSDKLoginKit
diff --git a/Facebook/FBSDKLoginKit.framework/Info.plist b/Facebook/FBSDKLoginKit.framework/Info.plist
diff --git a/Facebook/FBSDKShareKit.framework/FBSDKShareKit b/Facebook/FBSDKShareKit.framework/FBSDKShareKit
diff --git a/Facebook/FBSDKShareKit.framework/Headers/FBSDKAppGroupAddDialog.h b/Facebook/FBSDKShareKit.framework/Headers/FBSDKAppGroupAddDialog.h
diff --git a/Facebook/FBSDKShareKit.framework/Headers/FBSDKAppGroupContent.h b/Facebook/FBSDKShareKit.framework/Headers/FBSDKAppGroupContent.h
diff --git a/Facebook/FBSDKShareKit.framework/Headers/FBSDKAppGroupJoinDialog.h b/Facebook/FBSDKShareKit.framework/Headers/FBSDKAppGroupJoinDialog.h