Merge branch 'master' into dedicated-targets
* master: (46 commits) Use Kicker from master [Changelog] Fixed crash due to Podfile.lock containing multiple version requirements. [Integration] Update fixtures * Truncating the resources-to-copy.txt file if it already exists. [Travis] Attempt to fix 1.9.3 Issues Remove Rake dependency [Specs] Remove old uneeded integration spec [Core] Update for recent changes [Bundler] Add Gemfile.lock to source control and update Bundler on release Remove Octokit dep 2 [WIP] Remove Octokit dep Fix missing space in output. english fix for 'Podfile does not contain any dependency' Release 0.20.2 [Sandbox] Allow sandbox-pod to execute any tool inside a rbenv prefix. Bump to 0.20.2 [CHANGELOG] Cleanup. [Spec] Update integrations specs for 0.20.2 [CHANGELOG] Update for 0.20.2 [Sandbox] Allow any tool inside the Xcode.app bundle to be executed. ... Conflicts: spec/integration/install_add_pod/after/Pods/Pods-resources.sh spec/integration/install_custom_workspace/after/Podfile.lock spec/integration/install_custom_workspace/after/Pods/Manifest.lock spec/integration/install_external_source/after/Pods/Pods-resources.sh spec/integration/install_local_source/after/Pods/Pods-resources.sh spec/integration/install_multiple_targets/after/Pods/Pods-SampleApp_2-resources.sh spec/integration/install_multiple_targets/after/Pods/Pods-resources.sh spec/integration/install_multiple_targets/after/Pods/Pods-test-resources.sh spec/integration/install_new/after/Pods/Pods-resources.sh spec/integration/install_podfile_callbacks/after/Pods/Pods-resources.sh spec/integration/install_podspec/after/Pods/Pods-resources.sh spec/integration/install_remove_pod/after/Pods/Pods-resources.sh spec/integration/install_spec_callbacks/after/Pods/Pods-resources.sh spec/integration/install_subspecs/after/Podfile.lock spec/integration/install_subspecs/after/Pods/Manifest.lock spec/integration/update/after/Pods/Pods-resources.sh spec/integration_spec.rb spec/unit/installer_spec.rb
Showing
... | @@ -22,7 +22,7 @@ end | ... | @@ -22,7 +22,7 @@ end |
group :debugging do | group :debugging do | ||
gem "rb-fsevent" | gem "rb-fsevent" | ||
gem "kicker", :git => "https://github.com/alloy/kicker.git", :branch => "3.0.0" | gem "kicker", :git => "https://github.com/alloy/kicker.git", :branch => "master" | ||
gem "awesome_print" | gem "awesome_print" | ||
gem "pry" | gem "pry" | ||
gem "diffy" | gem "diffy" | ||
... | ... |
Gemfile.lock
0 → 100644
# -*- encoding: utf-8 -*- | # encoding: UTF-8 | ||
require File.expand_path('../lib/cocoapods/gem_version', __FILE__) | require File.expand_path('../lib/cocoapods/gem_version', __FILE__) | ||
require 'date' | require 'date' | ||
... | @@ -21,24 +21,21 @@ Gem::Specification.new do |s| | ... | @@ -21,24 +21,21 @@ Gem::Specification.new do |s| |
"in, third party open-source libraries, by creating a more centralized " \ | "in, third party open-source libraries, by creating a more centralized " \ | ||
"ecosystem." | "ecosystem." | ||
s.files = Dir["lib/**/*.rb"] + %w{ bin/pod bin/sandbox-pod README.md LICENSE CHANGELOG.md } | s.files = Dir["lib/**/*.rb"] + %w{ bin/pod bin/sandbox-pod README.md LICENSE CHANGELOG.md } | ||
s.executables = %w{ pod } | s.executables = %w{ pod sandbox-pod } | ||
s.require_paths = %w{ lib } | s.require_paths = %w{ lib } | ||
# Link with the version of CocoaPods-Core | # Link with the version of CocoaPods-Core | ||
s.add_runtime_dependency 'cocoapods-core', "= #{Pod::VERSION}" | s.add_runtime_dependency 'cocoapods-core', "= #{Pod::VERSION}" | ||
s.add_runtime_dependency 'claide', '~> 0.2.0' | s.add_runtime_dependency 'claide', '~> 0.3.2' | ||
s.add_runtime_dependency 'cocoapods-downloader', '~> 0.1.0' | s.add_runtime_dependency 'cocoapods-downloader', '~> 0.1.1' | ||
s.add_runtime_dependency 'xcodeproj', '~> 0.5.5' | s.add_runtime_dependency 'xcodeproj', '~> 0.6.0' | ||
s.add_runtime_dependency 'faraday', '~> 0.8.1' | |||
s.add_runtime_dependency 'octokit', '~> 1.7' | |||
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' | ||
s.add_runtime_dependency 'json', '~> 1.8.0' | s.add_runtime_dependency 'json', '~> 1.8.0' | ||
s.add_runtime_dependency 'open4', '~> 1.3.0' | s.add_runtime_dependency 'open4', '~> 1.3.0' | ||
s.add_runtime_dependency 'rake', '~> 10.0.0' | |||
s.add_runtime_dependency 'activesupport', '~> 3.2.13' | s.add_runtime_dependency 'activesupport', '~> 3.2.13' | ||
s.add_development_dependency 'bacon', '~> 1.1' | s.add_development_dependency 'bacon', '~> 1.1' | ||
... | @@ -48,4 +45,15 @@ Gem::Specification.new do |s| | ... | @@ -48,4 +45,15 @@ Gem::Specification.new do |s| |
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= | s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= | ||
s.required_ruby_version = '>= 1.8.7' | s.required_ruby_version = '>= 1.8.7' | ||
s.specification_version = 3 if s.respond_to? :specification_version | s.specification_version = 3 if s.respond_to? :specification_version | ||
changelog_path = File.expand_path('../CHANGELOG.md', __FILE__) | |||
if File.exists?(changelog_path) | |||
title_token = '## ' | |||
current_verison_title = title_token + Pod::VERSION.to_s | |||
full_changelog = File.open(changelog_path, "r:UTF-8") { |f| f.read } | |||
current_version_index = full_changelog.index(/^#{current_verison_title}/) | |||
previous_version_index = full_changelog.index(/^#{title_token}/, current_version_index + title_token.length) | |||
relevant = full_changelog[current_version_index..previous_version_index-1] | |||
s.post_install_message = "\nCHANGELOG:\n\n" + relevant + "\n" | |||
end | |||
end | end |
File moved
File moved
File moved
File moved
File moved
File moved
File moved
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
File moved
File moved
File moved
File moved
File moved
Please
register
or
sign in
to comment