Merge 165918f into 7c97b20

omniauth · Dec 26, 2013 · 3690de8 · 3690de8
2 parents 7c97b20 + 165918f
commit 3690de8
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,11 +4,10 @@ gemfile:
   - Gemfile.rack-1.3.x
 language: ruby
 rvm:
-  - rbx-18mode
-  - rbx-19mode
-  - jruby-18mode
+  - rbx-2.1.1
+  - rbx
   - jruby-19mode
-  - 1.8.7
   - 1.9.2
   - 1.9.3
   - 2.0.0
+  - 2.1.0
diff --git a/Gemfile b/Gemfile
@@ -4,6 +4,13 @@ gem 'jruby-openssl', :platforms => :jruby
 gem 'rake'
 gem 'yard'
 
+platforms :rbx do
+ gem 'rubysl', '~> 2.0'
+ gem 'psych'
+ gem 'json'
+ gem 'rubinius-developer_tools'
+end
+
 group :development do
   gem 'growl'
   gem 'guard'

diff --git a/Gemfile.rack-1.3.x b/Gemfile.rack-1.3.x
@@ -5,6 +5,13 @@ gem 'rack', '~> 1.3.0'
 gem 'rake'
 gem 'yard'
 
+platforms :rbx do
+ gem 'rubysl', '~> 2.0'
+ gem 'psych'
+ gem 'json'
+ gem 'rubinius-developer_tools'
+end
+
 group :test do
   gem 'coveralls', :require => false
   gem 'rack-test'