Merge branch 'master' into lua-scanner

Conflicts:
	lib/coderay/token_kinds.rb

1 files changed, 6 insertions, 6 deletions

diff --git a/Gemfile b/Gemfile
index aa03288..15a71ae 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,4 +1,4 @@
-source "http://rubygems.org"
+source 'https://rubygems.org'
 
 # Specify your gem's dependencies in coderay.gemspec
 gemspec
@@ -7,10 +7,10 @@ gemspec
 # Include everything needed to run rake, tests, features, etc.
 group :development do
   gem "bundler", ">= 1.0.0"
-  gem "rake", "~> 0.9.2"
+  gem "rake"
   gem "RedCloth", RUBY_PLATFORM == 'java' ? ">= 4.2.7" : ">= 4.0.3"
-  gem "term-ansicolor"
-  gem "shoulda-context", "~> 1.0.0" if RUBY_VERSION >= '1.8.7'
-  gem "json" unless RUBY_VERSION >= '1.9.1'
-  gem "rdoc" if RUBY_VERSION >= '1.8.7'
+  gem "term-ansicolor", '~> 1.2.2'
+  gem "shoulda-context", "~> 1.1.2"
+  gem "json" if RUBY_VERSION < '1.9'
+  gem "rdoc"
 end