From 119947269b159c0335cfc53b05b276f6cb1b469b Mon Sep 17 00:00:00 2001 From: Akira Matsuda Date: Mon, 25 Nov 2013 16:23:49 +0900 Subject: [PATCH] Use activerecord-jdbcsqlite3-adapter gem under jruby --- gemfiles/active_record_30.gemfile | 8 +++++++- gemfiles/active_record_31.gemfile | 8 +++++++- gemfiles/active_record_32.gemfile | 8 +++++++- gemfiles/active_record_40.gemfile | 8 +++++++- gemfiles/active_record_edge.gemfile | 8 +++++++- gemfiles/data_mapper_12.gemfile | 8 +++++++- gemfiles/sinatra_13.gemfile | 8 +++++++- gemfiles/sinatra_14.gemfile | 8 +++++++- 8 files changed, 56 insertions(+), 8 deletions(-) diff --git a/gemfiles/active_record_30.gemfile b/gemfiles/active_record_30.gemfile index 28a6eb8..1f0d47c 100644 --- a/gemfiles/active_record_30.gemfile +++ b/gemfiles/active_record_30.gemfile @@ -2,9 +2,15 @@ source 'https://rubygems.org' gem 'railties', '~> 3.0.20' gem 'activerecord', '~> 3.0.20', :require => 'active_record' -gem 'sqlite3' gem 'rspec-rails', '>= 2.0' gem 'nokogiri', '< 1.6' gem 'capybara', '< 2.1' +platforms :ruby, :rbx do + gem 'sqlite3' +end +platforms :jruby do + gem 'activerecord-jdbcsqlite3-adapter', '>= 1.3.0' +end + gemspec :path => '../' diff --git a/gemfiles/active_record_31.gemfile b/gemfiles/active_record_31.gemfile index fdaf0bf..0a4305d 100644 --- a/gemfiles/active_record_31.gemfile +++ b/gemfiles/active_record_31.gemfile @@ -2,7 +2,13 @@ source 'https://rubygems.org' gem 'railties', '~> 3.1.12' gem 'activerecord', '~> 3.1.12', :require => 'active_record' -gem 'sqlite3' gem 'rspec-rails', '>= 2.0' +platforms :ruby, :rbx do + gem 'sqlite3' +end +platforms :jruby do + gem 'activerecord-jdbcsqlite3-adapter', '>= 1.3.0' +end + gemspec :path => '../' diff --git a/gemfiles/active_record_32.gemfile b/gemfiles/active_record_32.gemfile index dc7b2ba..cc1907d 100644 --- a/gemfiles/active_record_32.gemfile +++ b/gemfiles/active_record_32.gemfile @@ -2,10 +2,16 @@ source 'https://rubygems.org' gem 'railties', '~> 3.2.3' gem 'activerecord', '~> 3.2.3', :require => 'active_record' -gem 'sqlite3' gem 'rspec-rails', '>= 2.0' gem 'nokogiri' gem 'xpath' gem 'mime-types' +platforms :ruby, :rbx do + gem 'sqlite3' +end +platforms :jruby do + gem 'activerecord-jdbcsqlite3-adapter', '>= 1.3.0' +end + gemspec :path => '../' diff --git a/gemfiles/active_record_40.gemfile b/gemfiles/active_record_40.gemfile index 3fc2b2c..18d7121 100644 --- a/gemfiles/active_record_40.gemfile +++ b/gemfiles/active_record_40.gemfile @@ -2,7 +2,13 @@ source 'https://rubygems.org' gem 'railties', '>= 4.0.0' gem 'activerecord', '>= 4.0.0', :require => 'active_record' -gem 'sqlite3' gem 'rspec-rails', '>= 2.0' +platforms :ruby, :rbx do + gem 'sqlite3' +end +platforms :jruby do + gem 'activerecord-jdbcsqlite3-adapter', '>= 1.3.0' +end + gemspec :path => '../' diff --git a/gemfiles/active_record_edge.gemfile b/gemfiles/active_record_edge.gemfile index bc2afba..cdf06bb 100644 --- a/gemfiles/active_record_edge.gemfile +++ b/gemfiles/active_record_edge.gemfile @@ -5,7 +5,13 @@ git 'git://github.com/rails/rails.git' do gem 'activerecord', :require => 'active_record' gem 'actionview', :require => 'action_view' end -gem 'sqlite3' + +platforms :ruby, :rbx do + gem 'sqlite3' +end +platforms :jruby do + gem 'activerecord-jdbcsqlite3-adapter', '>= 1.3.0' +end gem 'rspec-rails', '>= 2.0' diff --git a/gemfiles/data_mapper_12.gemfile b/gemfiles/data_mapper_12.gemfile index d4cd8f7..48b53a6 100644 --- a/gemfiles/data_mapper_12.gemfile +++ b/gemfiles/data_mapper_12.gemfile @@ -7,10 +7,16 @@ gem 'dm-aggregates', '~> 1.2.0' gem 'dm-transactions', '~> 1.2.0' gem 'dm-active_model', '~> 1.2.1' gem 'dm-sqlite-adapter', '~> 1.2.0' -gem 'sqlite3' gem 'rspec-rails', '>= 2.0' gem 'nokogiri' gem 'xpath' gem 'mime-types' +platforms :ruby, :rbx do + gem 'sqlite3' +end +platforms :jruby do + gem 'activerecord-jdbcsqlite3-adapter', '>= 1.3.0' +end + gemspec :path => '../' diff --git a/gemfiles/sinatra_13.gemfile b/gemfiles/sinatra_13.gemfile index 821774a..1921823 100644 --- a/gemfiles/sinatra_13.gemfile +++ b/gemfiles/sinatra_13.gemfile @@ -1,7 +1,6 @@ source 'https://rubygems.org' gem 'activerecord', '~> 3.2.3', :require => 'active_record' -gem 'sqlite3' gem 'railties', '~> 3.2.3' gem 'rspec-rails', '>= 2.0' gem 'sinatra', '~> 1.3.0' @@ -13,4 +12,11 @@ gem 'nokogiri' gem 'xpath' gem 'mime-types' +platforms :ruby, :rbx do + gem 'sqlite3' +end +platforms :jruby do + gem 'activerecord-jdbcsqlite3-adapter', '>= 1.3.0' +end + gemspec :path => '../' diff --git a/gemfiles/sinatra_14.gemfile b/gemfiles/sinatra_14.gemfile index be529c5..4b572d3 100644 --- a/gemfiles/sinatra_14.gemfile +++ b/gemfiles/sinatra_14.gemfile @@ -1,7 +1,6 @@ source 'https://rubygems.org' gem 'activerecord', '~> 3.2.0', :require => 'active_record' -gem 'sqlite3' gem 'railties', '~> 3.2.3' gem 'rspec-rails', '>= 2.0' gem 'sinatra', '~> 1.4.0' @@ -13,4 +12,11 @@ gem 'nokogiri' gem 'xpath' gem 'mime-types' +platforms :ruby, :rbx do + gem 'sqlite3' +end +platforms :jruby do + gem 'activerecord-jdbcsqlite3-adapter', '>= 1.3.0' +end + gemspec :path => '../'