From c0db7840fe6dfd9aef8120b24e05f7e6f400d382 Mon Sep 17 00:00:00 2001 From: Nick Sieger Date: Wed, 19 May 2010 15:38:27 -0500 Subject: More accurate JRuby gem requirements MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Santiago Pastorino Signed-off-by: José Valim --- Gemfile | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 23e76d225c..3b347ea9ef 100644 --- a/Gemfile +++ b/Gemfile @@ -17,15 +17,25 @@ if mri || RUBY_ENGINE == "rbx" gem 'yajl-ruby' gem "nokogiri", ">= 1.4.0" elsif RUBY_ENGINE == "jruby" - gem "jruby-debug" + gem "ruby-debug" + gem "jruby-openssl" end # AR -gem "sqlite3-ruby", "= 1.3.0.beta.2", :require => 'sqlite3' +if mri || RUBY_ENGINE == "rbx" + gem "sqlite3-ruby", "= 1.3.0.beta.2", :require => 'sqlite3' + + group :db do + gem "pg", ">= 0.9.0" + gem "mysql", ">= 2.8.1" + end +elsif RUBY_ENGINE == "jruby" + gem "activerecord-jdbcsqlite3-adapter" -group :db do - gem "pg", ">= 0.9.0" - gem "mysql", ">= 2.8.1" + group :db do + gem "activerecord-jdbcmysql-adapter" + gem "activerecord-jdbcpostgresql-adapter" + end end # AP -- cgit v1.2.3