Make the gemspec compatible with JRuby and enable spec runs under JRuby

binarylogic · Apr 29, 2014 · 6eae879 · 6eae879
1 parent 832272c
commit 6eae879
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -22,6 +22,8 @@ matrix:
       gemfile: test/gemfiles/Gemfile.rails-4.1.x
     - rvm: ree
       gemfile: test/gemfiles/Gemfile.rails-4.1.x
+    - rvm: 1.9.3
+      gemfile: test/gemfiles/Gemfile.rails-4.1.x
   allow_failures:
     - gemfile: test/gemfiles/Gemfile.rails-4.1.x
   fast_finish: true
diff --git a/Gemfile b/Gemfile
@@ -1,2 +1,5 @@
 source "https://rubygems.org"
-gemspec
+gemspec
+
+gem 'activerecord-jdbcsqlite3-adapter', :platforms => :jruby
+gem 'sqlite3', :platforms => :ruby
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -49,8 +49,9 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  activerecord-jdbcsqlite3-adapter
   authlogic!
   bcrypt-ruby (~> 3.1)
   scrypt (~> 1.2)
-  sqlite3 (~> 1.3)
+  sqlite3
   timecop (~> 0.7)
diff --git a/authlogic.gemspec b/authlogic.gemspec
@@ -18,7 +18,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'request_store', '~> 1.0'
   s.add_development_dependency 'bcrypt-ruby', '~> 3.1'
   s.add_development_dependency 'scrypt', '~> 1.2'
-  s.add_development_dependency 'sqlite3', '~> 1.3'
   s.add_development_dependency 'timecop', '~> 0.7'
 
   s.files         = `git ls-files`.split("\n")

diff --git a/test/gemfiles/Gemfile.rails-3.2.x b/test/gemfiles/Gemfile.rails-3.2.x
@@ -3,3 +3,5 @@ gemspec :path => "./../.."
 
 gem "activerecord", "3.2.17"
 gem "activesupport", "3.2.17"
+gem 'activerecord-jdbcsqlite3-adapter', :platforms => :jruby
+gem 'sqlite3', :platforms => :ruby
diff --git a/test/gemfiles/Gemfile.rails-4.0.x b/test/gemfiles/Gemfile.rails-4.0.x
@@ -1,5 +1,7 @@
 source "https://rubygems.org"
 gemspec :path => "./../.."
 
-gem "activerecord", "4.0.3"
-gem "activesupport", "4.0.3"
+gem "activerecord", "~> 4.0.3"
+gem "activesupport", "~> 4.0.3"
+gem 'activerecord-jdbcsqlite3-adapter', :platforms => :jruby
+gem 'sqlite3', :platforms => :ruby
diff --git a/test/gemfiles/Gemfile.rails-4.1.x b/test/gemfiles/Gemfile.rails-4.1.x
@@ -1,5 +1,7 @@
 source "https://rubygems.org"
 gemspec :path => "./../.."
 
-gem "activerecord", "4.1.0.rc1"
-gem "activesupport", "4.1.0.rc1"
+gem "activerecord", "~> 4.1.0"
+gem "activesupport", "~> 4.1.0"
+gem 'activerecord-jdbcsqlite3-adapter', :platforms => :jruby
+gem 'sqlite3', :platforms => :ruby