From c51a128b6ce02c2b2c23b788b7dccc104dcb9e73 Mon Sep 17 00:00:00 2001 From: "Peter M. Goldstein" Date: Sat, 14 Dec 2013 22:58:22 -0800 Subject: [PATCH 1/3] Add rbx gems to Gemfiles, update Travis labels --- .travis.yml | 4 ++-- Gemfile | 7 +++++++ Gemfile.rack-1.3.x | 7 +++++++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7676db9aa..970cc6d08 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,8 +4,8 @@ gemfile: - Gemfile.rack-1.3.x language: ruby rvm: - - rbx-18mode - - rbx-19mode + - rbx-2.1.1 + - rbx - jruby-18mode - jruby-19mode - 1.8.7 diff --git a/Gemfile b/Gemfile index 8128e4d53..241e8a3c0 100644 --- 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 index edd2f3b67..743ff75dc 100644 --- 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' From d564a17fafc06b3e892fc976284934c2049949c7 Mon Sep 17 00:00:00 2001 From: "Peter M. Goldstein" Date: Sat, 14 Dec 2013 23:19:29 -0800 Subject: [PATCH 2/3] Removed failing Ruby 1.8 VMs --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 970cc6d08..9a167d0b4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,9 +6,7 @@ language: ruby rvm: - rbx-2.1.1 - rbx - - jruby-18mode - jruby-19mode - - 1.8.7 - 1.9.2 - 1.9.3 - 2.0.0 From 165918fdcb144043041734531f7139d5c10a4e7c Mon Sep 17 00:00:00 2001 From: "Peter M. Goldstein" Date: Wed, 25 Dec 2013 16:34:50 -0800 Subject: [PATCH 3/3] Add Ruby 2.1.0 to the Travis config --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 9a167d0b4..4e5a6ecf1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,3 +10,4 @@ rvm: - 1.9.2 - 1.9.3 - 2.0.0 + - 2.1.0