Skip to content

Commit

Permalink
remove support for ruby 1.9.2, 1.9.3 and 2.0
Browse files Browse the repository at this point in the history
closes #1227
closes #1279
  • Loading branch information
flavorjones committed Jun 7, 2016
1 parent bac3683 commit 8487038
Show file tree
Hide file tree
Showing 10 changed files with 17 additions and 42 deletions.
6 changes: 1 addition & 5 deletions .autotest
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,7 @@ end

Autotest.add_hook :run_command do |at|
at.unit_diff = 'cat'
if ENV['ONENINE']
system "rake1.9 compile"
else
system "rake compile"
end
system "rake compile"
end

Autotest.add_hook :ran_command do |at|
Expand Down
3 changes: 0 additions & 3 deletions .cross_rubies
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
1.9.3-p551:i586-mingw32msvc
2.0.0-p645:i686-w64-mingw32
2.0.0-p645:x86_64-w64-mingw32
2.1.6:i686-w64-mingw32
2.1.6:x86_64-w64-mingw32
2.2.2:i686-w64-mingw32
Expand Down
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@ ext/java/Canna
ext/java/nokogiri/**/*.class
ext/nokogiri/*.dll
gems
lib/nokogiri/1.8
lib/nokogiri/1.9
lib/nokogiri/nokogiri.bundle
lib/nokogiri/nokogiri.jar
lib/nokogiri/nokogiri.rb
Expand Down
10 changes: 1 addition & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ language: ruby
sudo: false

rvm:
- 1.9.2
- 1.9.3
- 2.0
- 2.1
- 2.2
Expand All @@ -21,14 +19,8 @@ matrix:
allow_failures:
# https://github.com/travis-ci/travis-ci/issues/5361
- os: osx
rvm: 2.3.0
rvm: 2.3
exclude:
- os: osx
rvm: 1.9.2
- os: osx
rvm: 1.9.3
- os: osx
rvm: 2.0
- os: osx
rvm: jruby-1.7
- os: osx
Expand Down
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,16 @@
# 2.0.0 / unreleased


## Backwards incompatibilities.

This release ends support for:

* Ruby 1.9.2, for which official support ended on 2014-07-31
* Ruby 1.9.3, for which official support ended on 2015-02-23
* Ruby 2.0.0, for which official support ended on 2016-02-24




# 1.6.8 / 2016-06-06

Expand Down
2 changes: 1 addition & 1 deletion Manifest.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
.editorconfig
.gemtest
.travis.yml
CHANGELOG.rdoc
CHANGELOG.md
CONTRIBUTING.md
C_CODING_STYLE.rdoc
Gemfile
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ end

## Requirements

* Ruby 1.9.3 or higher, including any development packages necessary
* Ruby 2.1.0 or higher, including any development packages necessary
to compile native extensions.

* In Nokogiri 1.6.0 and later libxml2 and libxslt are bundled with the
Expand Down
6 changes: 2 additions & 4 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ CrossRuby = Struct.new(:version, :host) {
case minor_ver
when nil
raise "unsupported version: #{ver}"
when '1.9'
'191'
else
minor_ver.delete('.') << '0'
end
Expand Down Expand Up @@ -150,7 +148,7 @@ HOE = Hoe.spec 'nokogiri' do
else
self.spec_extras = {
:extensions => ["ext/nokogiri/extconf.rb"],
:required_ruby_version => '>= 1.9.2'
:required_ruby_version => '>= 2.1.0'
}
end

Expand Down Expand Up @@ -234,7 +232,7 @@ else
libs = dependencies.map { |name, dep| "#{name}-#{dep["version"]}" }.join(', ')

spec.required_ruby_version = [
'>= 1.9.2',
'>= 2.1.0',
"< #{CROSS_RUBIES.max_by(&:ver).minor_ver.succ}"
]

Expand Down
15 changes: 1 addition & 14 deletions ext/nokogiri/extconf.rb
Original file line number Diff line number Diff line change
Expand Up @@ -130,12 +130,7 @@ def package_config pkg, options={}
end

def nokogiri_try_compile
args = if defined?(RUBY_VERSION) && RUBY_VERSION <= "1.9.2"
["int main() {return 0;}"]
else
["int main() {return 0;}", "", {werror: true}]
end
try_compile(*args)
try_compile "int main() {return 0;}", "", {werror: true}
end

def check_libxml_version version=nil
Expand Down Expand Up @@ -380,14 +375,6 @@ def using_system_libraries?
arg_config('--use-system-libraries', !!ENV['NOKOGIRI_USE_SYSTEM_LIBRARIES'])
end

#
# monkey patches
#

# Workaround for Ruby bug #8074, introduced in Ruby 2.0.0, fixed in Ruby 2.1.0
# https://bugs.ruby-lang.org/issues/8074
@libdir_basename = "lib" if RUBY_VERSION < '2.1.0'

#
# main
#
Expand Down
3 changes: 0 additions & 3 deletions test_all
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,6 @@ RUBIES="\
ruby-2.3 \
ruby-2.2 \
ruby-2.1 \
ruby-2.0.0-p648 \
ruby-1.9.3-p551 \
ruby-1.9.2-p330 \
jruby-9.0.4.0 \
jruby-1.7.19
"
Expand Down

0 comments on commit 8487038

Please sign in to comment.