No bug - fix Result dependency so it builds, add scripts to avoid Car…

…thage accidents.
taher-mosbah · Mar 12, 2015 · 3b4e215 · 3b4e215
1 parent 42c18ff
commit 3b4e215
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 3 deletions.
diff --git a/Cartfile b/Cartfile
@@ -7,4 +7,4 @@ github "rs/SDWebImage"
 github "norio-nomura/Base32"
 github "DaveWoodCom/XCGLogger" ~> 1.8
 github "bignerdranch/Deferred" "master"
-github "bignerdranch/Result" "master"
+github "st3fan/Result" "master"
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -3,7 +3,7 @@ github "norio-nomura/Base32" "v0.2.2"
 github "bignerdranch/Deferred" "4a5fa72bc460d08e261da810a4d040a407b38db0"
 github "swisspol/GCDWebServer" "3.2.2"
 github "kif-framework/KIF" "v3.1.2"
-github "bignerdranch/Result" "c4106c0c69b4c15cb0aef50647f8a36891895826"
+github "st3fan/Result" "99d18bfd694e5008b55da69f5fa7b2ba7e0c6674"
 github "rs/SDWebImage" "3.7.1"
 github "st3fan/SWXMLHash" "0.6.4"
 github "Masonry/Snap" "0.0.6"

diff --git a/README.md b/README.md
@@ -32,7 +32,7 @@ Building the code
 
   ```
   cd firefox-ios
-  carthage checkout --no-use-binaries
+  sh ./checkout.sh
   ```
 
 1. Open `Client.xcodeproj` in Xcode.
@@ -78,4 +78,5 @@ Most if this is fixable and can be reported upstream.
 
 If you add a new dependency, ping @st3fan and he'll make sure things work correctly on our integration (xcode server) and dogfood builders.
 
+A command exists to make adding dependencies less painful: `./update.sh`.
 .
diff --git a/checkout.sh b/checkout.sh
@@ -0,0 +1 @@
+carthage checkout --no-use-binaries
diff --git a/update.sh b/update.sh
@@ -0,0 +1 @@
+carthage update --no-use-binaries --no-build