From 2981e684f59021e6126df6a7b242f585a2134ac7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorsten=20B=C3=B6ttger?= Date: Tue, 3 May 2016 20:43:11 +1200 Subject: [PATCH] mime-types gem version >= 3 requires mime-types-date which requires Ruby 2.x --- Gemfile | 1 + gemfiles/rails_4.0.gemfile | 2 +- gemfiles/rails_4.0_mongo_mapper.gemfile | 1 + gemfiles/rails_4.1.gemfile | 1 + gemfiles/rails_4.1_mongo_mapper.gemfile | 1 + gemfiles/rails_4.2.gemfile | 1 + gemfiles/rails_4.2_mongo_mapper.gemfile | 1 + gemfiles/rails_4.2_mongoid_5.gemfile | 1 + 8 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 5d475d0..3cf1e74 100644 --- a/Gemfile +++ b/Gemfile @@ -4,6 +4,7 @@ gem "sqlite3", :platforms => :ruby gem 'rubysl', :platforms => :rbx gem "jruby-openssl", :platforms => :jruby gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby +gem "mime-types", "~> 2" if Gem::Version.create(RUBY_VERSION.dup) <= Gem::Version.create('1.9.3') gem "rails", "~>4.2" gem 'mongoid', '~>4.0' if Gem::Version.create(RUBY_VERSION.dup) >= Gem::Version.create('1.9.3') gem 'sequel' diff --git a/gemfiles/rails_4.0.gemfile b/gemfiles/rails_4.0.gemfile index 7dace9d..c5c87eb 100644 --- a/gemfiles/rails_4.0.gemfile +++ b/gemfiles/rails_4.0.gemfile @@ -5,7 +5,7 @@ gem 'rubysl', :platforms => :rbx gem 'rubinius-developer_tools', :platforms => :rbx gem "jruby-openssl", :platforms => :jruby gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby -gem "mime-types", "~> 2" +gem "mime-types", "~> 2" if Gem::Version.create(RUBY_VERSION.dup) <= Gem::Version.create('1.9.3') gem "rails", "4.0.13" gem 'mongoid', '~>4.0' if Gem::Version.create(RUBY_VERSION.dup) >= Gem::Version.create('1.9.3') gem 'sequel' diff --git a/gemfiles/rails_4.0_mongo_mapper.gemfile b/gemfiles/rails_4.0_mongo_mapper.gemfile index 86b774d..ab15ea2 100644 --- a/gemfiles/rails_4.0_mongo_mapper.gemfile +++ b/gemfiles/rails_4.0_mongo_mapper.gemfile @@ -6,6 +6,7 @@ gem 'rubysl', :platforms => :rbx gem 'rubinius-developer_tools', :platforms => :rbx gem "jruby-openssl", :platforms => :jruby gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby +gem "mime-types", "~> 2" if Gem::Version.create(RUBY_VERSION.dup) <= Gem::Version.create('1.9.3') gem "rails", "4.0.13" gem 'sequel' gem 'mongo_mapper', '~>0.13' diff --git a/gemfiles/rails_4.1.gemfile b/gemfiles/rails_4.1.gemfile index f407c32..9bd8fcd 100644 --- a/gemfiles/rails_4.1.gemfile +++ b/gemfiles/rails_4.1.gemfile @@ -6,6 +6,7 @@ gem 'rubinius-developer_tools', :platforms => :rbx gem "jruby-openssl", :platforms => :jruby gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby gem "rails", "4.1.14" +gem "mime-types", "~> 2" if Gem::Version.create(RUBY_VERSION.dup) <= Gem::Version.create('1.9.3') gem 'mongoid', '~>4.0' if Gem::Version.create(RUBY_VERSION.dup) >= Gem::Version.create('1.9.3') gem 'sequel' gem 'dynamoid', '~> 1', :platforms => :ruby diff --git a/gemfiles/rails_4.1_mongo_mapper.gemfile b/gemfiles/rails_4.1_mongo_mapper.gemfile index fc6954f..56147bb 100644 --- a/gemfiles/rails_4.1_mongo_mapper.gemfile +++ b/gemfiles/rails_4.1_mongo_mapper.gemfile @@ -6,6 +6,7 @@ gem 'rubysl', :platforms => :rbx gem 'rubinius-developer_tools', :platforms => :rbx gem "jruby-openssl", :platforms => :jruby gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby +gem "mime-types", "~> 2" if Gem::Version.create(RUBY_VERSION.dup) <= Gem::Version.create('1.9.3') gem "rails", "4.1.14" gem 'sequel' gem 'mongo_mapper', '~> 0.13' diff --git a/gemfiles/rails_4.2.gemfile b/gemfiles/rails_4.2.gemfile index 3d3532c..bbdafa7 100644 --- a/gemfiles/rails_4.2.gemfile +++ b/gemfiles/rails_4.2.gemfile @@ -5,6 +5,7 @@ gem 'rubysl', :platforms => :rbx gem 'rubinius-developer_tools', :platforms => :rbx gem "jruby-openssl", :platforms => :jruby gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby +gem "mime-types", "~> 2" if Gem::Version.create(RUBY_VERSION.dup) <= Gem::Version.create('1.9.3') gem "rails", "4.2.5" gem 'mongoid', '~>4.0' if Gem::Version.create(RUBY_VERSION.dup) >= Gem::Version.create('1.9.3') gem 'sequel' diff --git a/gemfiles/rails_4.2_mongo_mapper.gemfile b/gemfiles/rails_4.2_mongo_mapper.gemfile index 604a7ee..62a8550 100644 --- a/gemfiles/rails_4.2_mongo_mapper.gemfile +++ b/gemfiles/rails_4.2_mongo_mapper.gemfile @@ -6,6 +6,7 @@ gem 'rubysl', :platforms => :rbx gem 'rubinius-developer_tools', :platforms => :rbx gem "jruby-openssl", :platforms => :jruby gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby +gem "mime-types", "~> 2" if Gem::Version.create(RUBY_VERSION.dup) <= Gem::Version.create('1.9.3') gem "rails", "4.2.5" gem 'sequel' gem 'mongo_mapper' diff --git a/gemfiles/rails_4.2_mongoid_5.gemfile b/gemfiles/rails_4.2_mongoid_5.gemfile index 249f34d..e17f547 100644 --- a/gemfiles/rails_4.2_mongoid_5.gemfile +++ b/gemfiles/rails_4.2_mongoid_5.gemfile @@ -5,6 +5,7 @@ gem 'rubysl', :platforms => :rbx gem 'rubinius-developer_tools', :platforms => :rbx gem "jruby-openssl", :platforms => :jruby gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby +gem "mime-types", "~> 2" if Gem::Version.create(RUBY_VERSION.dup) <= Gem::Version.create('1.9.3') gem "rails", "4.2.5" gem 'mongoid', '~>5.0' if Gem::Version.create(RUBY_VERSION.dup) >= Gem::Version.create('1.9.3') gem 'sequel'