From 28922df28e71dea57076055b6c778a644ff8a8b9 Mon Sep 17 00:00:00 2001 From: "kirby@puppetlabs.com" Date: Wed, 3 Jan 2018 17:05:35 -0800 Subject: [PATCH] Remove references to jruby 1.7 This commit removes references to jruby 1.7 and ruby 2.0 in Gemfile. Without this change there are references to unused ruby versions. --- Gemfile | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/Gemfile b/Gemfile index 580fde5..2c47177 100644 --- a/Gemfile +++ b/Gemfile @@ -1,11 +1,6 @@ source ENV['GEM_SOURCE'] || 'https://rubygems.org' -if RUBY_VERSION =~ /^1\.9\./ - gem 'json', '~> 1.8' -else - gem 'json', '>= 1.8' -end - +gem 'json', '>= 1.8' gem 'puma', '>= 3.6.0' # Rack 2.x requires ruby 2.2 or above. # As VMPooler should work in older jruby, we need to be Ruby 1.9.3 compatible. @@ -23,13 +18,7 @@ gem 'connection_pool', '>= 2.2.1' # ---- # nokogiri # redis -if RUBY_VERSION =~ /^1\.9\./ - gem 'nokogiri', '~> 1.6.0' - gem 'redis', '~> 3.0' -elsif RUBY_VERSION =~ /^2\.[0]/ - gem 'nokogiri', '~> 1.6.0' - gem 'redis', '~> 3.0' -elsif RUBY_VERSION =~ /^2\.[1]/ +if RUBY_VERSION =~ /^2\.[1]/ gem 'nokogiri', '~> 1.7.0' gem 'redis', '~> 3.0' elsif RUBY_VERSION =~ /^2\.2\.[01]/