From 224f73ba0a815e878f5bdb4b77ee4b9c38cdbda8 Mon Sep 17 00:00:00 2001 From: Yuki Nishijima Date: Mon, 4 Jan 2016 15:57:28 +0900 Subject: [PATCH] Remove gem dependencies for Ruby 1.8.7 We no longer support Ruby 1.8.7. --- gemfiles/active_record_32.gemfile | 9 --------- gemfiles/sinatra_14.gemfile | 17 +---------------- 2 files changed, 1 insertion(+), 25 deletions(-) diff --git a/gemfiles/active_record_32.gemfile b/gemfiles/active_record_32.gemfile index f742794..28295a4 100644 --- a/gemfiles/active_record_32.gemfile +++ b/gemfiles/active_record_32.gemfile @@ -5,21 +5,12 @@ gem 'activerecord', '~> 3.2.3', :require => 'active_record' gem 'rspec-rails', '~> 2.14.1' gem 'test-unit' -# Stick To Versions That Work Under Ruby 1.8 For Now -gem 'capybara', '< 2.1' -gem 'nokogiri', '< 1.6' -gem 'rubyzip', '< 1' -gem 'mime-types', '< 2' - platforms :ruby do if RUBY_VERSION > "2.1.0" gem 'sqlite3' else gem 'sqlite3', '1.3.8' end - if RUBY_VERSION <= "1.8.7" - gem 'i18n', '< 0.7.0' - end end platforms :jruby do gem 'activerecord-jdbcsqlite3-adapter', '>= 1.3.0' diff --git a/gemfiles/sinatra_14.gemfile b/gemfiles/sinatra_14.gemfile index cf06ca7..783d2ad 100644 --- a/gemfiles/sinatra_14.gemfile +++ b/gemfiles/sinatra_14.gemfile @@ -3,31 +3,16 @@ source 'https://rubygems.org' gem 'activerecord', '>= 4.0.0', :require => 'active_record' gem 'sinatra', '~> 1.4.0' gem 'rspec', '~> 2.14.1' - -if RUBY_VERSION <= "1.8.7" - gem 'padrino-helpers', '~> 0.11.0' -else - gem 'padrino-helpers', '~> 0.12.0' -end - +gem 'padrino-helpers', '~> 0.12.0' gem 'rack-test', '>= 0' gem 'sinatra-contrib', '~> 1.4.0' -# stick to versions that work under Ruby 1.8 for now -gem 'mime-types', '< 2.0' -gem 'nokogiri', '< 1.6' -gem 'capybara', '< 2.1' -gem 'rubyzip', '< 1' - platforms :ruby do if RUBY_VERSION > "2.1.0" gem 'sqlite3' else gem 'sqlite3', '1.3.8' end - if RUBY_VERSION <= "1.8.7" - gem 'i18n', '< 0.7.0' - end end platforms :jruby do gem 'activerecord-jdbcsqlite3-adapter', '>= 1.3.0'