From 4d11c5c237652a538c3a549bc5557d2106f45f18 Mon Sep 17 00:00:00 2001 From: Erik Michaels-Ober Date: Sun, 15 May 2011 12:08:54 -0700 Subject: [PATCH] Bundle therubyrhino on the Java platform --- Gemfile | 9 +++++---- Gemfile.lock | 2 ++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 5c37cf1..8778c8f 100644 --- a/Gemfile +++ b/Gemfile @@ -8,8 +8,13 @@ gem 'haml' gem 'pg' gem 'sass' +platforms :ruby do + gem 'therubyracer-heroku', '0.8.1.pre3' +end + platforms :jruby do gem 'jruby-openssl', '~> 0.7' + gem 'therubyrhino', '~> 1.72' end group :test do @@ -18,7 +23,3 @@ group :test do gem 'turn', :require => false gem 'webmock' end - -group :test, :production do - gem 'therubyracer-heroku', '0.8.1.pre3' -end diff --git a/Gemfile.lock b/Gemfile.lock index 8195008..027c3e1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -99,6 +99,7 @@ GEM tilt (~> 1.0) sqlite3 (1.3.3) therubyracer-heroku (0.8.1.pre3) + therubyrhino (1.72.7) thor (0.14.6) tilt (1.3) treetop (1.4.9) @@ -128,5 +129,6 @@ DEPENDENCIES simplecov sqlite3 therubyracer-heroku (= 0.8.1.pre3) + therubyrhino (~> 1.72) turn webmock