From 49d076507eef40ea0504180ada6b9526127b00fd Mon Sep 17 00:00:00 2001 From: Lukasz Strzalkowski Date: Sat, 2 Nov 2013 21:48:12 -0700 Subject: [PATCH] Make tests pass on jruby --- .travis.yml | 1 - Gemfile | 9 ++++++++- Gemfile.edge | 9 ++++++++- Gemfile.rails3 | 10 +++++++++- 4 files changed, 25 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 19f67cc9..fd881a3a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,6 @@ gemfile: matrix: allow_failures: - gemfile: Gemfile.edge - - rvm: jruby-19mode notifications: email: false campfire: diff --git a/Gemfile b/Gemfile index 00cd24d9..42a0a8a2 100644 --- a/Gemfile +++ b/Gemfile @@ -3,7 +3,14 @@ source 'https://rubygems.org' # Specify gem dependencies in active_model_serializers.gemspec gemspec -gem 'sqlite3' +platforms :ruby do + gem 'sqlite3' +end + +platforms :jruby do + gem 'activerecord-jdbcsqlite3-adapter' +end + gem 'coveralls', :require => false gem 'simplecov', :require => false diff --git a/Gemfile.edge b/Gemfile.edge index 281edceb..574d5746 100644 --- a/Gemfile.edge +++ b/Gemfile.edge @@ -2,7 +2,14 @@ source 'https://rubygems.org' gemspec -gem 'sqlite3' +platforms :ruby do + gem 'sqlite3' +end + +platforms :jruby do + gem 'activerecord-jdbcsqlite3-adapter' +end + gem 'coveralls', :require => false gem 'simplecov', :require => false diff --git a/Gemfile.rails3 b/Gemfile.rails3 index 5f6012a4..988ac10a 100644 --- a/Gemfile.rails3 +++ b/Gemfile.rails3 @@ -3,7 +3,15 @@ source 'https://rubygems.org' # Specify gem dependencies in active_model_serializers.gemspec gemspec -gem 'sqlite3' + +platforms :ruby do + gem 'sqlite3' +end + +platforms :jruby do + gem 'activerecord-jdbcsqlite3-adapter' +end + gem 'coveralls', :require => false gem 'simplecov', :require => false