Merge pull request #3750 from CocoaPods/seg-predictable-uuids

[Installer] Save the Pods project with deterministic UUIDs

CHANGELOG.md

@@ -13,6 +13,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
   [Samuel Giddins](https://github.com/segiddins)
   [#2443](https://github.com/CocoaPods/CocoaPods/issues/2443)
 
+* `Pods.xcodeproj` will now be written with deterministic UUIDs, vastly reducing
+  project churn and merge conflicts.  
+  [Samuel Giddins](https://github.com/segiddins)
+
 ##### Bug Fixes
 
 * Ensure that the `prepare_command` is run even when skipping the download

Gemfile.lock

@@ -24,11 +24,12 @@ GIT
 
 GIT
   remote: https://github.com/CocoaPods/Xcodeproj.git
-  revision: 700e41b26f170d31af2599c50cea5666923a6363
+  revision: 4fabf08c0c0b78c49f72092e3a125610b4377d25
   branch: master
   specs:
-    xcodeproj (0.25.0)
+    xcodeproj (0.25.1)
       activesupport (>= 3)
+      claide (~> 0.8.2)
       colored (~> 1.2)
 
 GIT

lib/cocoapods/installer.rb

@@ -621,6 +621,7 @@ module Pod
         pods_project.development_pods.remove_from_project if pods_project.development_pods.empty?
         pods_project.sort(:groups_position => :below)
         pods_project.recreate_user_schemes(false)
+        pods_project.predictabilize_uuids
         pods_project.save
       end
     end