Merge branch 'master' into fix-javascript-regexp

1 files changed, 4 insertions, 4 deletions

diff --git a/Gemfile b/Gemfile
index c19ac08..10dc31c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,12 +7,12 @@ gemspec
 # Include everything needed to run rake, tests, features, etc.
 group :development do
   gem 'bundler'
+  gem 'json', '>= 1.8' if RUBY_VERSION < '1.9'
   gem 'rake',             RUBY_VERSION < '1.9' ? '~> 10.5'    : '>= 10.5'
+  gem 'rdoc',             Gem::Version.new(RUBY_VERSION) < Gem::Version.new('1.9.3') ? '~> 4.2.2' : Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.2.2') ? '< 6' : '>= 6'
   gem 'RedCloth',         RUBY_PLATFORM == 'java' ? '= 4.2.9' : '>= 4.0.3'
-  gem 'term-ansicolor',   RUBY_VERSION < '2.0' ? '~> 1.3.2'   : '>= 1.3.2'
-  gem 'tins',             RUBY_VERSION < '2.0' ? '~> 1.6.0'   : '>= 1.6.0'
   gem 'shoulda-context',  RUBY_VERSION < '1.9' ? '= 1.2.1'    : '>= 1.2.1'
+  gem 'term-ansicolor',   RUBY_VERSION < '2.0' ? '~> 1.3.2'   : '>= 1.3.2'
   gem 'test-unit',        RUBY_VERSION < '1.9' ? '~> 2.0'     : '>= 3.0'
-  gem 'json', '>= 1.8' if RUBY_VERSION < '1.9'
-  gem 'rdoc',             Gem::Version.new(RUBY_VERSION) < Gem::Version.new('1.9.3') ? '~> 4.2.2' : Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.2.2') ? '< 6' : '>= 6'
+  gem 'tins',             RUBY_VERSION < '2.0' ? '~> 1.6.0'   : '>= 1.6.0'
 end