Update bundle and add temp build fix to `rake bootstrap`.

Gemfile.lock

@@ -18,7 +18,7 @@ GIT
 
 GIT
   remote: https://github.com/CocoaPods/Xcodeproj.git
-  revision: 607c0a9c40bf0f8a34504efade50fd2b9fd94842
+  revision: f33ca43a31c6bae3e49f0b49600ca0c28f969a1f
   branch: master
   specs:
     xcodeproj (0.15.1)
@@ -41,7 +41,7 @@ GIT
 
 GIT
   remote: https://github.com/alloy/cocoapods-trunk.git
-  revision: 20b9a8bb60ad6e59df4df7d4a960a4dd4a41afa0
+  revision: febc522b4e462bacd013a48adb704c769586bd7e
   specs:
     cocoapods-trunk (0.0.1)
       json (~> 1.8)
@@ -103,12 +103,12 @@ GEM
       simplecov (>= 0.7)
       term-ansicolor
       thor
-    diffy (3.0.1)
-    docile (1.1.2)
+    diffy (3.0.3)
+    docile (1.1.3)
     escape (0.0.4)
     ffi (1.9.3)
     fuzzy_match (2.0.4)
-    github-markup (1.0.0)
+    github-markup (1.1.0)
     i18n (0.6.9)
     json (1.8.1)
     json_pure (1.8.1)
@@ -116,7 +116,7 @@ GEM
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
       rb-kqueue (>= 0.2)
-    metaclass (0.0.2)
+    metaclass (0.0.4)
     method_source (0.8.2)
     mime-types (1.25.1)
     mocha (1.0.0)
@@ -140,7 +140,7 @@ GEM
     rb-fsevent (0.9.4)
     rb-inotify (0.9.3)
       ffi (>= 0.5.0)
-    rb-kqueue (0.2.0)
+    rb-kqueue (0.2.2)
       ffi (>= 0.5.0)
     redcarpet (2.3.0)
     rest-client (1.6.7)
@@ -150,13 +150,13 @@ GEM
       multi_json
       simplecov-html (~> 0.8.0)
     simplecov-html (0.8.0)
-    slop (3.4.7)
-    term-ansicolor (1.2.2)
-      tins (~> 0.8)
-    thor (0.18.1)
-    tins (0.13.2)
+    slop (3.5.0)
+    term-ansicolor (1.3.0)
+      tins (~> 1.0)
+    thor (0.19.1)
+    tins (1.0.1)
     yajl-ruby (1.1.0)
-    yard (0.8.7.3)
+    yard (0.8.7.4)
 
 PLATFORMS
   ruby

Rakefile

@@ -14,6 +14,17 @@ task :bootstrap, :use_bundle_dir? do |t, args|
   puts "Updating submodules"
   execute_command "git submodule update --init --recursive"
 
+  require 'rbconfig'
+  if RbConfig::CONFIG['prefix'] == '/System/Library/Frameworks/Ruby.framework/Versions/2.0/usr'
+    # Workaround Apple's mess. See https://github.com/CocoaPods/Xcodeproj/issues/137
+    #
+    # TODO This is not as correct as actually fixing the issue, figure out if we
+    # can override these build flags:
+    #
+    # ENV['DLDFLAGS'] = '-undefined dynamic_lookup -multiply_defined suppress'
+    ENV['ARCHFLAGS'] = '-Wno-error=unused-command-line-argument-hard-error-in-future'
+  end
+
   puts "Installing gems"
   if args[:use_bundle_dir?]
     execute_command "env XCODEPROJ_BUILD=1 bundle install --path ./travis_bundle_dir"