Merge branch 'mkirk/update-carthage'

8 years ago · d168485831
parent f59f908930 28cb7751d8
commit d168485831
3 changed files with 8 additions and 4 deletions
--- a/6
+++ b/6
@ -1,3 +1,7 @@
-github "mxcl/PromiseKit"
+# Avoid PromiseKit 5 for now.
+# From the maintainer:
+# > PromiseKit 5 has been released, but is not yet fully documented, 
+# > so we advise sticking with version 4 for the time being.
+github "mxcl/PromiseKit" ~> 4.0
 github "TheLevelUp/ZXingObjC"

--- a/Cartfile.resolved
+++ b/Cartfile.resolved
@ -1,2 +1,2 @@
-github "TheLevelUp/ZXingObjC" "3.2.1"
-github "mxcl/PromiseKit" "4.4.1"
+github "TheLevelUp/ZXingObjC" "3.2.2"
+github "mxcl/PromiseKit" "4.5.0"
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 4c73f1a2f0c0bceca7f0fb6777adb81c99ec0d4f
+Subproject commit a172c59aa282c4e0cb43c8134abc5b237d3ca885