Commit 85ee1f16 authored by Fabio Pelosin's avatar Fabio Pelosin

Merge branch 'master' into 0.17

* master:
  corrected some typos
  [Spec] Make green by updating Reachability fixture.
  Fix RubyGems version too old error message to show current version instead of hardcoded value.

Conflicts:
	lib/cocoapods/specification.rb
parents 8a9d29e5 3f6e44ad
...@@ -7,7 +7,7 @@ require 'rubygems' ...@@ -7,7 +7,7 @@ require 'rubygems'
# #
# E.g. https://github.com/CocoaPods/CocoaPods/issues/398 # E.g. https://github.com/CocoaPods/CocoaPods/issues/398
unless Gem::Version::Requirement.new('>= 1.4.0').satisfied_by?(Gem::Version.new(Gem::VERSION)) unless Gem::Version::Requirement.new('>= 1.4.0').satisfied_by?(Gem::Version.new(Gem::VERSION))
STDERR.puts "\e[1;31m" + "Your RubyGems version (1.8.24) is too old, please update with: `gem update --system`" + "\e[0m" STDERR.puts "\e[1;31m" + "Your RubyGems version (#{Gem::VERSION}) is too old, please update with: `gem update --system`" + "\e[0m"
exit 1 exit 1
end end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment