Applying changes from fulcrum-agile#114 for jruby support.

kaleworsley · Apr 20, 2013 · be491a5 · be491a5
1 parent 57a89b2
commit be491a5
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,6 +8,7 @@ before_script:
 rvm:
   - 1.9.2
   - 1.9.3
+  - jruby-19mode
 script:
   - "bundle exec rspec spec"
   - "bundle exec rake --trace jasmine:ci"
diff --git a/Gemfile b/Gemfile
@@ -23,11 +23,21 @@ gem 'fastercsv', '1.5.3', :platforms => :ruby_18
 # (using standard csv lib if ruby version is 1.9)
 
 group :production do
-  gem 'pg'
+  platforms :ruby do
+    gem 'pg'
+  end
+  platforms :jruby do
+    gem 'activerecord-jdbcpostgresql-adapter'
+  end
 end
 
 group :development, :test do
-  gem 'sqlite3'
+  platforms :ruby do
+    gem 'sqlite3'
+  end
+  platforms :jruby do
+    gem 'activerecord-jdbcsqlite3-adapter'
+  end
   gem 'rspec-rails'
   gem 'factory_girl_rails'
   gem 'jasmine', '1.1.0'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -172,6 +172,8 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  activerecord-jdbcpostgresql-adapter
+  activerecord-jdbcsqlite3-adapter
   capybara
   capybara-webkit
   compass-rails