[Installer] Sort Pods project recursively

Gemfile.lock

@@ -7,7 +7,7 @@ GIT
 
 GIT
   remote: https://github.com/CocoaPods/Core.git
-  revision: 925b48bb35d969e2f74777a883ef3a9e5659dde3
+  revision: cdcd8debaf2faef61e7987fadd4e508ee557f223
   branch: master
   specs:
     cocoapods-core (0.23.0)
@@ -17,7 +17,7 @@ GIT
 
 GIT
   remote: https://github.com/CocoaPods/Xcodeproj.git
-  revision: 74a73481a7573c8eea28c1feaa0480882522fa53
+  revision: f877729c796fbf275f100d44ab7eb75d9b52c330
   branch: paths-refactor
   specs:
     xcodeproj (0.9.0)
@@ -86,7 +86,7 @@ GEM
     escape (0.0.4)
     ffi (1.9.0)
     github-markup (0.7.5)
-    i18n (0.6.4)
+    i18n (0.6.5)
     json (1.8.0)
     listen (1.1.6)
       rb-fsevent (>= 0.9.3)
@@ -94,12 +94,12 @@ GEM
       rb-kqueue (>= 0.2)
     metaclass (0.0.1)
     method_source (0.8.2)
-    mime-types (1.23)
+    mime-types (1.24)
     mocha (0.14.0)
       metaclass (~> 0.0.1)
     mocha-on-bacon (0.2.2)
       mocha (>= 0.13.0)
-    multi_json (1.7.8)
+    multi_json (1.7.9)
     nap (0.5.1)
     open4 (1.3.0)
     posix-spawn (0.3.6)
@@ -112,7 +112,7 @@ GEM
       yajl-ruby (~> 1.1.0)
     rake (10.1.0)
     rb-fsevent (0.9.3)
-    rb-inotify (0.9.0)
+    rb-inotify (0.9.1)
       ffi (>= 0.5.0)
     rb-kqueue (0.2.0)
       ffi (>= 0.5.0)
@@ -128,7 +128,7 @@ GEM
     term-ansicolor (1.2.2)
       tins (~> 0.8)
     thor (0.18.1)
-    tins (0.8.3)
+    tins (0.9.0)
     yajl-ruby (1.1.0)
     yard (0.8.7)
 

lib/cocoapods/installer.rb

@@ -390,8 +390,7 @@ module Pod
       UI.message "- Writing Xcode project file to #{UI.path sandbox.project_path}" do
         pods_project.pods.remove_from_project if pods_project.pods.empty?
         pods_project.development_pods.remove_from_project if pods_project.development_pods.empty?
-        pods_project.main_group.sort_by_type!
-        pods_project['Frameworks'].sort_by_type!
+        pods_project.main_group.recursively_sort_by_type
         pods_project.save
       end
     end

cocoapods-integration-specs @ d4f858d2

-Subproject commit d989cb15e2426eeeaf5d1e4b7e9a0ea179f09906
+Subproject commit d4f858d2312d84900f6dd8316e88250745ed856d

spec/unit/installer_spec.rb

@@ -337,13 +337,8 @@ module Pod
           @installer.send(:prepare_pods_project)
         end
 
-        it "sorts the main group" do
-          @installer.pods_project.main_group.expects(:sort_by_type!)
-          @installer.send(:write_pod_project)
-        end
-
-        it "sorts the frameworks group" do
-          @installer.pods_project['Frameworks'].expects(:sort_by_type!)
+        it "recursively sorts the project by type" do
+          @installer.pods_project.main_group.expects(:recursively_sort_by_type)
           @installer.send(:write_pod_project)
         end