1. 23 Sep, 2013 1 commit
    • 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
  2. 22 Sep, 2013 1 commit
  3. 21 Sep, 2013 9 commits
  4. 20 Sep, 2013 2 commits
  5. 19 Sep, 2013 1 commit
  6. 15 Sep, 2013 4 commits
  7. 12 Sep, 2013 3 commits
  8. 11 Sep, 2013 4 commits
  9. 10 Sep, 2013 7 commits
  10. 09 Sep, 2013 8 commits