Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: CocoaPods/CocoaPods
...
head fork: CocoaPods/CocoaPods
Commits on Sep 04, 2013
@fabiopelosin fabiopelosin Update CHANGELOG.md f21459b
@orta orta Update CHANGELOG.md 4728bf8
@blakewatters blakewatters Add `--copy-links` argument to rsync invocation during Resource Bundl…
…e copying. refs CocoaPods/CocoaPods#1309

This ensures that destination files are copied into the application bundle instead of symbolic links preventing the creation of invalid apps during Archive.
14542d8
@blakewatters blakewatters Use `BUILT_PRODUCTS_DIR` instead of `TARGET_BUILD_DIR` so that Copy R…
…esources script succeeds during Archive builds
e0571cf
Commits on Sep 05, 2013
@blakewatters blakewatters Add CHANGELOG entry detailing Resource Bundle fixes. refs #1329 1faa261
@fabiopelosin fabiopelosin [Integration] Update fixtures 28b23c8
Commits on Sep 06, 2013
@blakewatters blakewatters Rework resource bundle target creation so that a single common resour…
…ce bundle target is shared by all targets. fixes #1338
4863732
Commits on Sep 09, 2013
@fabiopelosin fabiopelosin [Installer] Improve project sorting f1900d7
@fabiopelosin fabiopelosin Merge pull request #1342 from blakewatters/bugfix/1338-ensure-uniquen…
…ess-of-resource-bundle-targets

Prevent creation of multiple Resource Bundle targets with the same name
0b348a1
@fabiopelosin fabiopelosin Fix specs 0c6c70b
Commits on Sep 10, 2013
@fabiopelosin fabiopelosin [Xcodeproj] Update 31d5b99
@fabiopelosin fabiopelosin Add support for Xcode 5 a4cfec2
Commits on Sep 12, 2013
@fabiopelosin fabiopelosin [TargetInstaller] Set the architecture according to the value of the …
…user targets
003f92e
Commits on Sep 14, 2013
@fabiopelosin fabiopelosin [Generator::Xcconfig] Add support for XCTest
Closes #1366
d779088
Chris Gummer Ensure resource bundles are copied to installation location on instal…
…l actions. Fixes #1364
f08e7d5
Chris Gummer Update CHANGELOG for #1364 31ddbdd
@alloy alloy Merge pull request #1367 from chrisgummer/1364-install-resource-bundles
1364 install resource bundles
ff7b81f
Commits on Sep 18, 2013
@alloy alloy Update integration spec fixtures. 50e19ae
Commits on Sep 20, 2013
@alloy alloy Merge branch 'master' into xcode-5-support
Conflicts:
	Gemfile.lock
	spec/cocoapods-integration-specs
f047715
@alloy alloy [Analyzer] Do not warn about multiple `ARCHS` if there are none at all. c33023c
@alloy alloy [Project] Make all Xcode 5 project validations green. ddcd6cf
@alloy alloy [Examples] Update to Xcode 5 default project settings to fix CI build. f112953
@mtitolo mtitolo [Examples] Set ONLY_ACTIVE_ARCH to NO for iOS builds 0ac79ea
@alloy alloy [CHANGELOG] Update for 0.25.0 07b875d
@alloy alloy Merge pull request #1352 from CocoaPods/xcode-5-support
Problems with 64-bit Builds and Xcode 5 GM
9374330
@alloy alloy [CHANGELOG] Add link to Xcode 5 PR. 2db1549
@alloy alloy [Bundle] Bump Xcodeproj to 0.11.0 a4f0663
@alloy alloy Release 0.25.0 29012fd