From 849898ff5bb1f4b2f3774320d7590b8c54946c31 Mon Sep 17 00:00:00 2001
From: Erik Michaels-Ober <sferik@gmail.com>
Date: Sat, 15 Oct 2011 13:16:51 -0700
Subject: [PATCH] Loosen gem dependencies

---
 Gemfile                |  2 +-
 rails_admin.gemspec    | 28 ++++++++++++++--------------
 spec/dummy_app/Gemfile | 26 ++++++++++++--------------
 3 files changed, 27 insertions(+), 29 deletions(-)

diff --git a/Gemfile b/Gemfile
index 7df7905c3d..dc1cf218f5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -48,7 +48,7 @@ group :debug do
 end
 
 platforms :jruby, :mingw_18, :ruby_18 do
-  gem 'fastercsv', '~> 1.5.4'
+  gem 'fastercsv', '~> 1.5'
 end
 
 gemspec
diff --git a/rails_admin.gemspec b/rails_admin.gemspec
index 317d388ed8..067a433067 100644
--- a/rails_admin.gemspec
+++ b/rails_admin.gemspec
@@ -3,20 +3,20 @@ require File.expand_path('../lib/rails_admin/version', __FILE__)
 
 Gem::Specification.new do |gem|
   # If you add a dependency, please maintain alphabetical order
-  gem.add_dependency 'builder', '~> 3.0.0'
-  gem.add_dependency 'haml', ['>= 3.1.0', '< 3.3.0']
-  gem.add_dependency 'rails', '~> 3.1.1'
-  gem.add_dependency 'coffee-rails'
-  gem.add_dependency 'bootstrap-sass'
-  gem.add_dependency 'jquery-rails'
-  gem.add_development_dependency 'capybara', '~> 1.0'
-  gem.add_development_dependency 'launchy', '~> 2.0'
-  gem.add_development_dependency 'devise', '~> 1.4'
-  gem.add_development_dependency 'factory_girl', '~> 2.0'
-  gem.add_development_dependency 'generator_spec', '~> 0.8'
-  gem.add_development_dependency 'paperclip', '~> 2.3'
-  gem.add_development_dependency 'rspec-rails', '~> 2.6'
-  gem.add_development_dependency 'simplecov', '~> 0.4'
+  gem.add_dependency 'builder', '~> 3.0'
+  gem.add_dependency 'haml', '~> 3.1'
+  gem.add_dependency 'rails', '~> 3.1'
+  gem.add_dependency 'coffee-rails', '~> 3.1'
+  gem.add_dependency 'bootstrap-sass', ['~> 1.3', '>= 1.3.1']
+  gem.add_dependency 'jquery-rails', '~> 1.0'
+  gem.add_development_dependency 'capybara'
+  gem.add_development_dependency 'launchy'
+  gem.add_development_dependency 'devise'
+  gem.add_development_dependency 'factory_girl'
+  gem.add_development_dependency 'generator_spec'
+  gem.add_development_dependency 'paperclip'
+  gem.add_development_dependency 'rspec-rails'
+  gem.add_development_dependency 'simplecov'
   gem.authors = ["Erik Michaels-Ober", "Bogdan Gaza", "Petteri Kaapa", "Benoit Benezech"]
   gem.description = %q{RailsAdmin is a Rails engine that provides an easy-to-use interface for managing your data.}
   gem.email = ['sferik@gmail.com', 'bogdan@cadmio.org', 'petteri.kaapa@gmail.com']
diff --git a/spec/dummy_app/Gemfile b/spec/dummy_app/Gemfile
index 46ff83ea6a..93e1c62e3b 100644
--- a/spec/dummy_app/Gemfile
+++ b/spec/dummy_app/Gemfile
@@ -1,23 +1,17 @@
 source 'http://rubygems.org'
 
-gem 'rails', '~>3.1.0'
-gem 'json'
+gem 'rails', '~> 3.1'
+gem 'devise', '~> 1.4'
+gem 'rails_admin', :path => '../../'
+gem 'mlb', '~> 0.5'
+gem 'paperclip', '~> 2.4'
 
 # Gems used only for assets and not required
 # in production environments by default.
 group :assets do
-  gem 'sass-rails', '~> 3.1.0'
-  gem 'coffee-rails', '~> 3.1.0'
-  gem 'uglifier'
-end
-
-gem 'rails_admin', :path => '../../'
-gem 'devise', '~> 1.4'
-gem 'mlb', '~> 0.5.5'
-gem 'paperclip', '~> 2.3.16'
-
-platforms :jruby, :mingw_18, :ruby_18 do
-  gem 'fastercsv', '~> 1.5.4'
+  gem 'sass-rails', '~> 3.1'
+  gem 'coffee-rails', '~> 3.1'
+  gem 'uglifier', '~> 1.0'
 end
 
 group :development, :test do
@@ -49,3 +43,7 @@ group :development, :test do
     end
   end
 end
+
+platforms :jruby, :mingw_18, :ruby_18 do
+  gem 'fastercsv', '~> 1.5'
+end