From bcc0f8b2cfd186b83ea1f8fedd2efda85b33d2ff Mon Sep 17 00:00:00 2001 From: Tomer Brisker Date: Sun, 29 Oct 2017 14:40:28 +0200 Subject: [PATCH] Drop Ruby<2 support --- .travis.yml | 8 -------- fog-xml.gemspec | 19 +++++-------------- gemfiles/Gemfile.1.9.2- | 8 -------- 3 files changed, 5 insertions(+), 30 deletions(-) delete mode 100644 gemfiles/Gemfile.1.9.2- diff --git a/.travis.yml b/.travis.yml index e6c8afa..3770a48 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,18 +1,10 @@ matrix: include: - - rvm: 1.8.7 - gemfile: gemfiles/Gemfile.1.9.2- - - rvm: 1.9.2 - gemfile: gemfiles/Gemfile.1.9.2- - - rvm: 1.9.3 - gemfile: gemfiles/Gemfile.1.9.3+ - rvm: 2.0.0 gemfile: gemfiles/Gemfile.1.9.3+ - rvm: 2.3.0 gemfile: gemfiles/Gemfile.1.9.3+ env: COVERAGE=true - - rvm: ree - gemfile: gemfiles/Gemfile.1.9.2- - rvm: jruby gemfile: gemfiles/Gemfile.1.9.3+ before_install: diff --git a/fog-xml.gemspec b/fog-xml.gemspec index 500ca4c..7373b0e 100644 --- a/fog-xml.gemspec +++ b/fog-xml.gemspec @@ -22,22 +22,13 @@ Gem::Specification.new do |spec| spec.test_files = spec.files.grep(/^(test|spec|features)\//) spec.require_paths = %w(lib) + spec.required_ruby_version = '>= 2.0.0' + spec.add_dependency "fog-core" - case RUBY_VERSION - when /^(1\.8.*|1\.9\.[012])$/ - spec.add_dependency "nokogiri", ">= 1.5.11", "< 1.6.2" - spec.add_development_dependency "rake", "< 11.0.0" - when /^(1\.9\.([^012]|\d.+)|2\.0.*)$/ - spec.add_dependency "nokogiri", ">= 1.5.11", "< 1.7.0" - spec.add_development_dependency "rake" - else - spec.add_dependency "nokogiri", ">= 1.5.11", "< 2.0.0" - spec.add_development_dependency "rake" - end + spec.add_dependency "nokogiri", ">= 1.5.11", "< 1.7.0" #pinned for 2.0 support + spec.add_development_dependency "rake" spec.add_development_dependency "minitest" spec.add_development_dependency "turn" spec.add_development_dependency "pry" - spec.add_development_dependency "coveralls" if RUBY_VERSION.to_f >= 1.9 - spec.add_development_dependency "term-ansicolor", "< 1.4.0" if RUBY_VERSION.start_with? "1.9." - spec.add_development_dependency "tins", "< 1.7.0" if RUBY_VERSION.start_with? "1.9." + spec.add_development_dependency "coveralls" end diff --git a/gemfiles/Gemfile.1.9.2- b/gemfiles/Gemfile.1.9.2- deleted file mode 100644 index 1afb6d3..0000000 --- a/gemfiles/Gemfile.1.9.2- +++ /dev/null @@ -1,8 +0,0 @@ -source "https://rubygems.org" - -gem 'mime-types', '< 2.0' -gem 'nokogiri', '< 1.6' -gem 'rest-client', '~> 1.6.8' -gem 'fog-core' - -gemspec :path => '../'