Check mainline activerecord-jdbcsqlite3-adapter

collectiveidea · Dec 27, 2017 · 1dc5977 · 1dc5977
1 parent c194d1d
commit 1dc5977
Showing 1 changed file with 1 addition and 9 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,22 +1,14 @@
 source 'https://rubygems.org'
 
-rails_version = ENV['RAILS_VERSION'] || ''
-
 gem 'rake'
 
 platforms :ruby do
   gem 'sqlite3'
 end
 
 platforms :jruby do
+  gem 'activerecord-jdbcsqlite3-adapter'
   gem 'jruby-openssl'
-  if rails_version == 'edge' || rails_version.match(/5\.\d+\.\d+/)
-    gem 'activerecord-jdbcsqlite3-adapter',
-        :git => 'https://github.com/jruby/activerecord-jdbc-adapter.git',
-        :branch => 'rails-5'
-  else
-    gem 'activerecord-jdbcsqlite3-adapter'
-  end
   gem 'mime-types', ['~> 2.6', '< 2.99']
 end