Merge branch 'core-extraction' into installer_clean_up
* core-extraction: (92 commits) Minor fixes. [Changelog] [SpecHelper] More refinement for bacon support. [TargetInstaller] Extracted XCConfig generation to Generator::XCConfing. Release 0.16.0 [RakeFile] More fixes for release task. [Gemspec] Require xcodeproj 0.4.0. [RakeFile] Minor fix for release task. [TargetInstaller] Fixed spec. [Command::Search] Catch DSL errors and present a warning. [UI] Minor adaptation for Core extraction. [List] Adapted for Core extraction. [Gemfile] Updated bundle. [Sandbox] Adapted for changes in Core. [LocalPod] Adapted for Core extraction. [Fixtures] Updates. [SpecHelper] Improved bacon support. [Sandobox] Adapted for Core extraction. [Resolver] adapted for Core extraction [Linter] Adoped Core Linter and renamed to DeepLinter (WIP). ... Conflicts: lib/cocoapods/command/install.rb lib/cocoapods/command/linter.rb lib/cocoapods/installer.rb lib/cocoapods/lockfile.rb lib/cocoapods/resolver.rb spec/unit/installer_spec.rb
Showing
| ... | @@ -3,7 +3,8 @@ source "http://rubygems.org" | ... | @@ -3,7 +3,8 @@ source "http://rubygems.org" |
| gemspec | gemspec | ||
| group :development do | group :development do | ||
| gem "xcodeproj", :git => "git://github.com/CocoaPods/Xcodeproj.git", :branch => "refactor" | gem "cocoapods-core", :git => "git://github.com/CocoaPods/Core.git" | ||
| gem "xcodeproj", :git => "git://github.com/CocoaPods/Xcodeproj.git" | |||
| gem "mocha", "~> 0.11.4" | gem "mocha", "~> 0.11.4" | ||
| gem "bacon" | gem "bacon" | ||
| gem "mocha-on-bacon" | gem "mocha-on-bacon" | ||
| ... | ... |
| # -*- encoding: utf-8 -*- | # -*- encoding: utf-8 -*- | ||
| $:.unshift File.expand_path('../lib', __FILE__) | $:.unshift File.expand_path('../lib', __FILE__) | ||
| require 'cocoapods' | require 'cocoapods/version' | ||
| Gem::Specification.new do |s| | Gem::Specification.new do |s| | ||
| s.name = "cocoapods" | s.name = "cocoapods" | ||
| ... | @@ -26,7 +26,9 @@ Gem::Specification.new do |s| | ... | @@ -26,7 +26,9 @@ Gem::Specification.new do |s| |
| s.executables = %w{ pod } | s.executables = %w{ pod } | ||
| s.require_paths = %w{ lib } | s.require_paths = %w{ lib } | ||
| s.add_runtime_dependency 'xcodeproj', '~> 0.3.5' | s.add_runtime_dependency 'cocoapods-core' | ||
| s.add_runtime_dependency 'claide', '~> 0.1' | |||
| s.add_runtime_dependency 'xcodeproj', '~> 0.4.0' | |||
| 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' | ||
| ... | @@ -34,7 +36,7 @@ Gem::Specification.new do |s| | ... | @@ -34,7 +36,7 @@ Gem::Specification.new do |s| |
| s.add_runtime_dependency 'escape', '~> 0.0.4' | s.add_runtime_dependency 'escape', '~> 0.0.4' | ||
| s.add_runtime_dependency 'json', '~> 1.7.3' | s.add_runtime_dependency 'json', '~> 1.7.3' | ||
| s.add_runtime_dependency 'open4', '~> 1.3.0' | s.add_runtime_dependency 'open4', '~> 1.3.0' | ||
| s.add_runtime_dependency 'rake', '~> 0.9.0' | s.add_runtime_dependency 'rake', '~> 0.9.4' | ||
| s.add_runtime_dependency 'activesupport', '~> 3.2.6' | s.add_runtime_dependency 'activesupport', '~> 3.2.6' | ||
| s.add_development_dependency 'bacon', '~> 1.1' | s.add_development_dependency 'bacon', '~> 1.1' | ||
| ... | ... |
No preview for this file type
No preview for this file type
Please
register
or
sign in
to comment