Merge branch 'master' into 0.17
* master: Release 0.16.2 Bump Xcodeproj dependency. Update CHANGELOG Make specs green. Update bundle. Run on the new Travis CI mac workers on both system Ruby and 1.9.3-p327. Generate Pods target in Mac OS X with the specified deployment target. Disable libSystem objects for ARC libs that target older platforms. Fix podspec in Podfile with no options. Add install note for RVM users about symlinking GCC to LLVM-GCC. Removed comments from Mercurial sample podspec used in tests. Added support for pre-download over Mercurial. Quote storyboard and xib paths Conflicts: CHANGELOG.md Gemfile.lock cocoapods.gemspec examples/AFNetworking Mac Example/Podfile.lock examples/AFNetworking iOS Example/Podfile.lock examples/MGSplitView/Podfile.lock examples/RKTwitter/Podfile.lock examples/RKTwitter/RKTwitter.xcodeproj/project.pbxproj examples/RelativePathProject/Podfile.lock examples/SSCatalog/Podfile.lock examples/SSCatalog/SSCatalog.xcodeproj/project.pbxproj examples/TargetTest/Podfile.lock lib/cocoapods.rb lib/cocoapods/dependency.rb lib/cocoapods/platform.rb lib/cocoapods/podfile.rb lib/cocoapods/project.rb lib/cocoapods/specification.rb spec/fixtures/mercurial-repo/.hg/dirstate spec/fixtures/mercurial-repo/.hg/last-message.txt spec/fixtures/mercurial-repo/.hg/store/00changelog.i spec/fixtures/mercurial-repo/.hg/store/00manifest.i spec/fixtures/mercurial-repo/.hg/store/fncache spec/fixtures/mercurial-repo/.hg/store/undo spec/fixtures/mercurial-repo/.hg/undo.desc spec/fixtures/mercurial-repo/.hg/undo.dirstate spec/integration_spec.rb spec/unit/dependency_spec.rb spec/unit/local_pod_spec.rb spec/unit/podfile_spec.rb spec/unit/specification_spec.rb
Showing
... | @@ -30,7 +30,7 @@ Gem::Specification.new do |s| | ... | @@ -30,7 +30,7 @@ Gem::Specification.new do |s| |
s.add_runtime_dependency 'cocoapods-core', "= #{Pod::VERSION}" | s.add_runtime_dependency 'cocoapods-core', "= #{Pod::VERSION}" | ||
s.add_runtime_dependency 'claide', '~> 0.1' | s.add_runtime_dependency 'claide', '~> 0.1' | ||
s.add_runtime_dependency 'cocoapods-downloader', '~> 0.1' | s.add_runtime_dependency 'cocoapods-downloader', '~> 0.1' | ||
s.add_runtime_dependency 'xcodeproj', '~> 0.4.1' | s.add_runtime_dependency 'xcodeproj', '~> 0.4.3' | ||
s.add_runtime_dependency 'faraday', '~> 0.8.1' | s.add_runtime_dependency 'faraday', '~> 0.8.1' | ||
s.add_runtime_dependency 'octokit', '~> 1.7' | s.add_runtime_dependency 'octokit', '~> 1.7' | ||
... | ... |
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
148 KB
565 KB
138 KB
520 KB
986 Bytes
1007 Bytes
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.