Merge pull request #56 from petergoldstein/feature/jruby_and_travis_i…

…n_mongoid_3_0 JRuby compatibility and Travis integration for existing Mongoid 3.0 branch
carrierwaveuploader · Jan 15, 2013 · b445a38 · b445a38
2 parents fb61fb9 + 0c3612a
commit b445a38
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,3 @@
+rvm:
+  - 1.9.3
+  - jruby-19mode
diff --git a/Gemfile b/Gemfile
@@ -1,4 +1,8 @@
 source "http://rubygems.org"
 
+group :development, :test do
+  gem 'json', :platforms => [:jruby]
+end
+
 # Specify your gem's dependencies in carrierwave-mongoid.gemspec
 gemspec