Merge remote-tracking branch 'upstream/master'

* upstream/master:
  Update for Xcodeproj HEAD.
  Don't validate the git repo settings, as the installer cleans it out.

examples/AFNetworking Mac Example/Podfile.lock

 PODS:
   - AFNetworking (0.7.0):
     - JSONKit
-  - FormatterKit (0.6.0)
+  - FormatterKit (0.7.0)
   - JSONKit (1.4)
 
 DEPENDENCIES:

examples/AFNetworking iOS Example/Podfile.lock

 PODS:
   - AFNetworking (0.7.0):
     - JSONKit
-  - FormatterKit (0.6.0)
+  - FormatterKit (0.7.0)
   - JSONKit (1.4)
 
 DEPENDENCIES:

examples/MacRubySample/Podfile.lock

 PODS:
   - ASIHTTPRequest (1.8.1)
-  - CocoaLumberjack (1.2.1)
+  - ASIHTTPRequest (1.8.1)
+  - CocoaLumberjack (1.3.2)
+  - SBJson (3.0.4)
   - SBJson (3.0.4)
 
 DEPENDENCIES:

Xcodeproj @ 338e4d37

-Subproject commit 2e3186e00a2849dc6c4facb38a92775b754103a0
+Subproject commit 338e4d37f282121754f10f6d169256a57a64860d

lib/cocoapods/installer/target_installer.rb

@@ -78,9 +78,9 @@ module Pod
         xcconfig.merge!('HEADER_SEARCH_PATHS' => quoted(sandbox.header_search_paths).join(" "))
 
         support_files_group = @project.group("Targets Support Files").create_group(@target_definition.lib_name)
-        support_files_group.add_file_paths(target_support_files)
+        support_files_group.create_files(target_support_files)
 
-        xcconfig_file = support_files_group.file_with_path(xcconfig_filename)
+        xcconfig_file = support_files_group.files.where(:path => xcconfig_filename)
 
         configure_build_configurations(xcconfig_file)
         create_files(pods, sandbox)

lib/cocoapods/project.rb

@@ -37,11 +37,10 @@ module Pod
 
     def self.for_platform(platform)
       Pod::Project.new.tap do |project|
-        project.main_group << project.groups.new({ 'name' => 'Pods' })
-        framework = project.add_system_framework(platform == :ios ? 'Foundation' : 'Cocoa')
-        framework.group = project.groups.new({ 'name' => 'Frameworks' })
-        project.main_group << framework.group
+        project.main_group << project.groups.new('name' => 'Pods')
+        project.add_system_framework(platform == :ios ? 'Foundation' : 'Cocoa')
 
+        # TODO this should al move to Xcodeproj as the default behavior of a new project
         configuration_list = project.objects.add(Xcodeproj::Project::Object::XCConfigurationList, {
           'defaultConfigurationIsVisible' => '0',
           'defaultConfigurationName' => 'Release',

spec/integration_spec.rb

@@ -78,10 +78,6 @@ else
             'PODS' => ['SSToolkit (0.1.3)'],
             'DEPENDENCIES' => ["SSToolkit (from `#{url}', commit `#{commit}')"]
           }
-
-          Dir.chdir(config.project_pods_root + 'SSToolkit') do
-            `git config --get remote.origin.url`.strip.should == url
-          end
         end
 
         it "installs a library with a podspec outside of the repo" do