Merge branch 'master' into lib-subcommand
* master: (59 commits) [Bundle] update Update CHANGELOG.md Release 0.21.0.rc1 [Gemspec] Update Xcodeproj [Bundle] update Changelog [Bundle] Update [Fixtures] Update for release [Bundle] Update [Rakefile] Examples robustness for future versions of Xcode [CHANGELOG] [Generator::Xcconfig] Docs [Bundle] Use Xcodeproj from master [Installer] Rename #targets to #aggregate_targets Add files which were creating issues with git Delete files creating issues with git Update integration test fixtures Case change for case-sensitive file systems Update tests Move method below attributes ... Conflicts: Gemfile.lock
Showing
| ... | @@ -30,7 +30,7 @@ s.files = Dir["lib/**/*.rb"] + %w{ bin/pod bin/sandbox-pod README.md LICENSE CHA | ... | @@ -30,7 +30,7 @@ s.files = Dir["lib/**/*.rb"] + %w{ bin/pod bin/sandbox-pod README.md LICENSE CHA |
| s.add_runtime_dependency 'cocoapods-core', "= #{Pod::VERSION}" | s.add_runtime_dependency 'cocoapods-core', "= #{Pod::VERSION}" | ||
| s.add_runtime_dependency 'claide', '~> 0.3.2' | s.add_runtime_dependency 'claide', '~> 0.3.2' | ||
| s.add_runtime_dependency 'cocoapods-downloader', '~> 0.1.1' | s.add_runtime_dependency 'cocoapods-downloader', '~> 0.1.1' | ||
| s.add_runtime_dependency 'xcodeproj', '~> 0.6.0' | s.add_runtime_dependency 'xcodeproj', '~> 0.7.0' | ||
| s.add_runtime_dependency 'colored', '~> 1.2' | s.add_runtime_dependency 'colored', '~> 1.2' | ||
| s.add_runtime_dependency 'escape', '~> 0.0.4' | s.add_runtime_dependency 'escape', '~> 0.0.4' | ||
| ... | ... |
lib/cocoapods/target.rb
0 → 100644
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
spec/unit/target_spec.rb
0 → 100644
Please
register
or
sign in
to comment