• Fabio Pelosin's avatar
    Merge branch 'master' into pods-project-edit-feature · 6d53f280
    Fabio Pelosin authored
    * master:
      [README] Use proper wording for ‘sponsors’.
      [Bundle] Update with Xcodeproj 0.11.1
      Release 0.25.0
      [Bundle] Bump Xcodeproj to 0.11.0
      [CHANGELOG] Add link to Xcode 5 PR.
      [CHANGELOG] Update for 0.25.0
      [Examples] Set ONLY_ACTIVE_ARCH to NO for iOS builds
      [Examples] Update to Xcode 5 default project settings to fix CI build.
      [Project] Make all Xcode 5 project validations green.
      [Analyzer] Do not warn about multiple `ARCHS` if there are none at all.
      Update integration spec fixtures.
      Update CHANGELOG for #1364
      Ensure resource bundles are copied to installation location on install actions. Fixes #1364
      [Generator::Xcconfig] Add support for XCTest
      [TargetInstaller] Set the architecture according to the value of the user targets
      Add support for Xcode 5
      [Xcodeproj] Update
      Fix specs
      Rework resource bundle target creation so that a single common resource bundle target is shared by all targets. fixes #1338
    
    Conflicts:
    	Gemfile.lock
    	lib/cocoapods/installer.rb
    	lib/cocoapods/installer/analyzer.rb
    	lib/cocoapods/installer/target_installer.rb
    	lib/cocoapods/installer/target_installer/pod_target_installer.rb
    	lib/cocoapods/target.rb
    	spec/cocoapods-integration-specs
    	spec/unit/installer/target_installer_spec.rb
    	spec/unit/installer_spec.rb
    6d53f280
Name
Last commit
Last update
bin Loading commit data...
examples Loading commit data...
lib Loading commit data...
spec Loading commit data...
.gitignore Loading commit data...
.gitmodules Loading commit data...
.kick Loading commit data...
.travis.yml Loading commit data...
.yardopts Loading commit data...
CHANGELOG.md Loading commit data...
CONTRIBUTING.md Loading commit data...
Gemfile Loading commit data...
Gemfile.lock Loading commit data...
LICENSE Loading commit data...
README.md Loading commit data...
Rakefile Loading commit data...
cocoapods.gemspec Loading commit data...