From 7c5f3f6c444b73192abbcc19ef9e3c987cdf7ab0 Mon Sep 17 00:00:00 2001 From: Mike Dalessio Date: Sun, 21 Apr 2013 23:06:57 -0400 Subject: [PATCH] Deprecating Ruby 1.8. --- Rakefile | 6 +++--- build_all | 2 +- tasks/cross_compile.rb | 2 +- test_all | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Rakefile b/Rakefile index 0e502f8b31..f8c3e4c029 100644 --- a/Rakefile +++ b/Rakefile @@ -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 ] @@ -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 @@ -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" diff --git a/build_all b/build_all index 5f00e52523..c6327f733d 100755 --- a/build_all +++ b/build_all @@ -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: diff --git a/tasks/cross_compile.rb b/tasks/cross_compile.rb index 9cb9dbdcfe..07148ec3ff 100644 --- a/tasks/cross_compile.rb +++ b/tasks/cross_compile.rb @@ -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 diff --git a/test_all b/test_all index f77476dc84..becbe6c194 100755 --- a/test_all +++ b/test_all @@ -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 @@ -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 }