🐼 Added platform jruby and added jdbc.

jashmenn · Sep 22, 2014 · e6662c0 · e6662c0
1 parent 75151b1
commit e6662c0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,6 +6,7 @@ rvm:
   - 1.9.3
   - 2.0.0
   - rbx-2
+  - jruby
 
 gemfile:
   - Gemfile
@@ -18,7 +19,6 @@ env:
   - DB=sqlite3
   - DB=mysql
   - DB=postgresql
-  - DB=jdbc-mysql
 
 matrix:
   allow_failures:

diff --git a/activeuuid.gemspec b/activeuuid.gemspec
@@ -25,7 +25,13 @@ Gem::Specification.new do |s|
   s.add_development_dependency "fabrication"
   s.add_development_dependency "sqlite3"
   s.add_development_dependency "pg"
-  s.add_development_dependency "mysql2"
+
+  if RUBY_PLATFORM == 'java'
+    s.add_development_dependency "activerecord-jdbc-adapter"
+    s.add_development_dependency "activerecord-jdbcmysql-adapter"
+  else
+    s.add_development_dependency "mysql2"
+  end
 
   s.add_runtime_dependency "uuidtools"
   s.add_runtime_dependency "activerecord", '>= 3.1'