Commit 4d84a4fc authored by Kyle Fuller's avatar Kyle Fuller

Drop support for Ruby 1.8.7

parent f410f973
...@@ -6,10 +6,20 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides ...@@ -6,10 +6,20 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
##### Breaking ##### Breaking
* Support of older versions of Ruby has been dropped and CocoaPods now depends
on Ruby 2.0.0 or greater. This is due to the release of Xcode 6.0 which has
dropped support for OS X 10.8 which results in the minimum version of
Ruby pre-installed on OS X is now 2.0.0.
If you are using a custom installation of Ruby which is older than 2.0.0, you
will need to update. Or even better, migrate to system Ruby.
[Kyle Fuller](https://github.com/kylef)
* Attempts to resolve circular dependencies will now raise an exception. * Attempts to resolve circular dependencies will now raise an exception.
[Samuel Giddins](https://github.com/segiddins) [Samuel Giddins](https://github.com/segiddins)
[Molinillo#6](https://github.com/CocoaPods/Molinillo/issues/6) [Molinillo#6](https://github.com/CocoaPods/Molinillo/issues/6)
##### Enhancements ##### Enhancements
* The `pod push` has been removed as it has been deprecated in favour of `pod * The `pod push` has been removed as it has been deprecated in favour of `pod
......
...@@ -29,10 +29,7 @@ group :development do ...@@ -29,10 +29,7 @@ group :development do
# Integration tests # Integration tests
gem 'diffy' gem 'diffy'
gem 'clintegracon' gem 'clintegracon'
gem 'rubocop'
if RUBY_VERSION >= '1.9.3'
gem 'rubocop'
end
if RUBY_PLATFORM.include?('darwin') if RUBY_PLATFORM.include?('darwin')
# Make Xcodeproj faster # Make Xcodeproj faster
...@@ -48,10 +45,3 @@ group :debugging do ...@@ -48,10 +45,3 @@ group :debugging do
gem 'ruby-prof' gem 'ruby-prof'
end end
group :ruby_1_8_7 do
# Lock the current lowest requirement for ActiveSupport 3 to ensure we don't
# re-introduce https://github.com/CocoaPods/CocoaPods/issues/1950
gem 'i18n', '0.6.4'
gem 'mime-types', '< 2.0'
gem 'activesupport', '< 4'
end
...@@ -118,7 +118,6 @@ GEM ...@@ -118,7 +118,6 @@ GEM
rb-kqueue (>= 0.2) rb-kqueue (>= 0.2)
metaclass (0.0.4) metaclass (0.0.4)
method_source (0.8.2) method_source (0.8.2)
mime-types (1.25.1)
mocha (1.1.0) mocha (1.1.0)
metaclass (~> 0.0.1) metaclass (~> 0.0.1)
mocha-on-bacon (0.2.2) mocha-on-bacon (0.2.2)
...@@ -163,7 +162,6 @@ PLATFORMS ...@@ -163,7 +162,6 @@ PLATFORMS
ruby ruby
DEPENDENCIES DEPENDENCIES
activesupport (< 4)
awesome_print awesome_print
bacon bacon
bundler (~> 1.3) bundler (~> 1.3)
...@@ -176,10 +174,8 @@ DEPENDENCIES ...@@ -176,10 +174,8 @@ DEPENDENCIES
cocoapods-trunk! cocoapods-trunk!
cocoapods-try! cocoapods-try!
diffy diffy
i18n (= 0.6.4)
kicker kicker
libxml-ruby libxml-ruby
mime-types (< 2.0)
mocha mocha
mocha-on-bacon mocha-on-bacon
molinillo! molinillo!
......
#!/usr/bin/env ruby #!/usr/bin/env ruby
if RUBY_VERSION > '1.8.7' && Encoding.default_external != Encoding::UTF_8 if Encoding.default_external != Encoding::UTF_8
puts "\e[33mWARNING: CocoaPods requires your terminal to be using UTF-8 encoding." puts "\e[33mWARNING: CocoaPods requires your terminal to be using UTF-8 encoding."
if ENV['TRAVIS'] if ENV['TRAVIS']
puts <<-DOC puts <<-DOC
......
...@@ -50,6 +50,6 @@ Gem::Specification.new do |s| ...@@ -50,6 +50,6 @@ Gem::Specification.new do |s|
## Make sure you can build the gem on older versions of RubyGems too: ## Make sure you can build the gem on older versions of RubyGems too:
s.rubygems_version = "1.6.2" s.rubygems_version = "1.6.2"
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 = '>= 2.0.0'
s.specification_version = 3 if s.respond_to? :specification_version s.specification_version = 3 if s.respond_to? :specification_version
end end
...@@ -66,15 +66,10 @@ CLIntegracon.configure do |c| ...@@ -66,15 +66,10 @@ CLIntegracon.configure do |c|
# Register special handling for YAML files # Register special handling for YAML files
paths = [%r{Podfile\.lock}, %r{Manifest\.lock$}, %r{xcodeproj\.yaml$}] paths = [%r{Podfile\.lock}, %r{Manifest\.lock$}, %r{xcodeproj\.yaml$}]
c.has_special_handling_for(*paths) do |path| c.has_special_handling_for(*paths) do |path|
if RUBY_VERSION < '1.9' # Remove CocoaPods version
nil # CP is not sorting array derived from hashes whose order is yaml = File.open(path) { |f| YAML.load(f) }
# undefined in 1.8.7 yaml.delete('COCOAPODS')
else YAML.dump(yaml)
# Remove CocoaPods version
yaml = File.open(path) { |f| YAML.load(f) }
yaml.delete('COCOAPODS')
YAML.dump(yaml)
end
end end
# So we don't need to compare them directly # So we don't need to compare them directly
......
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