Skip to content

Commit

Permalink
Deprecating Ruby 1.8.
Browse files Browse the repository at this point in the history
  • Loading branch information
flavorjones committed Apr 22, 2013
1 parent 497088d commit 7c5f3f6
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ HOE = Hoe.spec 'nokogiri' do
self.clean_globs += [
'nokogiri.gemspec',
'lib/nokogiri/nokogiri.{bundle,jar,rb,so}',
'lib/nokogiri/{1.8,1.9,2.0}',
'lib/nokogiri/{1.9,2.0}',
# GENERATED_PARSER,
# GENERATED_TOKENIZER
]
Expand Down Expand Up @@ -67,7 +67,7 @@ HOE = Hoe.spec 'nokogiri' do
else
self.spec_extras = {
:extensions => ["ext/nokogiri/extconf.rb"],
:required_ruby_version => '>= 1.8.7'
:required_ruby_version => '>= 1.9.2'
}
end

Expand Down Expand Up @@ -216,7 +216,7 @@ end

desc "build a windows gem without all the ceremony."
task "gem:windows" => "gem" do
cross_rubies = ["1.8.7-p358", "1.9.3-p194", "2.0.0-p0"]
cross_rubies = ["1.9.3-p194", "2.0.0-p0"]
ruby_cc_version = cross_rubies.collect { |_| _.split("-").first }.join(":") # e.g., "1.8.7:1.9.2"
rake_compiler_config_path = "#{ENV['HOME']}/.rake-compiler/config.yml"

Expand Down
2 changes: 1 addition & 1 deletion build_all
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# here's what I recommend for building all the gems:
#
# 1. set up a vagrant VM guest running ubuntu lucid 32-bit.
# 2. install rvm, and install 1.8.7, 1.9.3 and jruby.
# 2. install rvm, and install 1.9.3, 2.0.0 and jruby.
# 3. `sudo apt-get install mingw32`
#
# as you build, you may run into these problems:
Expand Down
2 changes: 1 addition & 1 deletion tasks/cross_compile.rb
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ def install

task :file_list do
HOE.spec.files += Dir["lib/nokogiri/nokogiri.rb"]
HOE.spec.files += Dir["lib/nokogiri/{1.8,1.9,2.0}/nokogiri.so"]
HOE.spec.files += Dir["lib/nokogiri/{1.9,2.0}/nokogiri.so"]
end
end

Expand Down
4 changes: 2 additions & 2 deletions test_all
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
# (e.g., 1.9.3's glob_helper). ["rake test:valgrind:suppression"]
#

RUBIES="ruby-1.9.3-p327 jruby-1.7.3 jruby-1.6.5.1 jruby-1.6.7.2 ree-1.8.7-2011.12 ruby-1.9.2-p320 ruby-1.8.7-p370"
RUBIES="ruby-1.9.3-p327 jruby-1.7.3 jruby-1.6.5.1 jruby-1.6.7.2 ruby-1.9.2-p320"
TEST_LOG=test.log
VALGRIND_LOG=valgrind.log

Expand All @@ -34,7 +34,7 @@ function rvm_use {

function generate_parser_and_tokenizer {
old_ruby=$current_ruby
rvm_use ruby-1.8.7-p357
rvm_use ruby-1.9.3-p327
bundle exec rake generate 2>&1 > /dev/null
rvm_use $old_ruby
}
Expand Down

4 comments on commit 7c5f3f6

@chrisroos
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if the README should've been updated in this commit to reflect the fact that 1.8 is no longer support? At the moment, the README still says that Nokogiri requires Ruby 1.8 or 1.9, but it fails if I try to use it with 1.8.

@flavorjones
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was in the release notes, but yes, we should change it in the README as well.

@flavorjones
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

README updated.

@chrisroos
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great stuff.

Please sign in to comment.