From e574fd647518998886e92c08d9e1235641dfb889 Mon Sep 17 00:00:00 2001 From: Yuki Nishijima Date: Sat, 19 Apr 2014 18:58:05 -0700 Subject: [PATCH] Do not lock the version of sqlite3 if Ruby is 2.1.1 or higher --- gemfiles/active_record_30.gemfile | 6 +++++- gemfiles/active_record_31.gemfile | 6 +++++- gemfiles/active_record_32.gemfile | 6 +++++- gemfiles/active_record_40.gemfile | 6 +++++- gemfiles/active_record_41.gemfile | 6 +++++- gemfiles/active_record_edge.gemfile | 6 +++++- gemfiles/data_mapper_12.gemfile | 6 +++++- gemfiles/sinatra_13.gemfile | 6 +++++- gemfiles/sinatra_14.gemfile | 6 +++++- 9 files changed, 45 insertions(+), 9 deletions(-) diff --git a/gemfiles/active_record_30.gemfile b/gemfiles/active_record_30.gemfile index 3c6528f..d9146ff 100644 --- a/gemfiles/active_record_30.gemfile +++ b/gemfiles/active_record_30.gemfile @@ -11,7 +11,11 @@ gem 'rubyzip', '< 1' gem 'mime-types', '< 2' platforms :ruby, :rbx do - gem 'sqlite3', '1.3.8' + if RUBY_VERSION > "2.1.0" + gem 'sqlite3' + else + gem 'sqlite3', '1.3.8' + end end platforms :jruby do gem 'activerecord-jdbcsqlite3-adapter', '>= 1.3.0' diff --git a/gemfiles/active_record_31.gemfile b/gemfiles/active_record_31.gemfile index 2f9a2db..4f25920 100644 --- a/gemfiles/active_record_31.gemfile +++ b/gemfiles/active_record_31.gemfile @@ -11,7 +11,11 @@ gem 'rubyzip', '< 1' gem 'mime-types', '< 2' platforms :ruby do - gem 'sqlite3', '1.3.8' + if RUBY_VERSION > "2.1.0" + gem 'sqlite3' + else + gem 'sqlite3', '1.3.8' + end end platforms :jruby do gem 'activerecord-jdbcsqlite3-adapter', '>= 1.3.0' diff --git a/gemfiles/active_record_32.gemfile b/gemfiles/active_record_32.gemfile index 5c30b1b..6813ed4 100644 --- a/gemfiles/active_record_32.gemfile +++ b/gemfiles/active_record_32.gemfile @@ -11,7 +11,11 @@ gem 'rubyzip', '< 1' gem 'mime-types', '< 2' platforms :ruby do - gem 'sqlite3', '1.3.8' + if RUBY_VERSION > "2.1.0" + gem 'sqlite3' + else + gem 'sqlite3', '1.3.8' + end end platforms :jruby do gem 'activerecord-jdbcsqlite3-adapter', '>= 1.3.0' diff --git a/gemfiles/active_record_40.gemfile b/gemfiles/active_record_40.gemfile index b9518b6..9558510 100644 --- a/gemfiles/active_record_40.gemfile +++ b/gemfiles/active_record_40.gemfile @@ -5,7 +5,11 @@ gem 'activerecord', '~> 4.0.0', :require => 'active_record' gem 'rspec-rails', '>= 2.0' platforms :ruby do - gem 'sqlite3', '1.3.8' + if RUBY_VERSION > "2.1.0" + gem 'sqlite3' + else + gem 'sqlite3', '1.3.8' + end end platforms :jruby do gem 'activerecord-jdbcsqlite3-adapter', '>= 1.3.0' diff --git a/gemfiles/active_record_41.gemfile b/gemfiles/active_record_41.gemfile index 53cbf41..1c2ddc2 100644 --- a/gemfiles/active_record_41.gemfile +++ b/gemfiles/active_record_41.gemfile @@ -7,7 +7,11 @@ gem 'rspec-rails', '>= 2.0' gem 'rspec-rails', '>= 2.0' platforms :ruby do - gem 'sqlite3', '1.3.8' + if RUBY_VERSION > "2.1.0" + gem 'sqlite3' + else + gem 'sqlite3', '1.3.8' + end end platforms :jruby do gem 'activerecord-jdbcsqlite3-adapter', '>= 1.3.0' diff --git a/gemfiles/active_record_edge.gemfile b/gemfiles/active_record_edge.gemfile index b29322d..66f5e2c 100644 --- a/gemfiles/active_record_edge.gemfile +++ b/gemfiles/active_record_edge.gemfile @@ -9,7 +9,11 @@ end gem 'arel', :github => 'rails/arel' platforms :ruby do - gem 'sqlite3', '1.3.8' + if RUBY_VERSION > "2.1.0" + gem 'sqlite3' + else + gem 'sqlite3', '1.3.8' + end end platforms :jruby do gem 'activerecord-jdbcsqlite3-adapter', '>= 1.3.0' diff --git a/gemfiles/data_mapper_12.gemfile b/gemfiles/data_mapper_12.gemfile index 1500e3e..9f7dfe5 100644 --- a/gemfiles/data_mapper_12.gemfile +++ b/gemfiles/data_mapper_12.gemfile @@ -16,7 +16,11 @@ gem 'rubyzip', '< 1' gem 'mime-types', '< 2' platforms :ruby do - gem 'sqlite3', '1.3.8' + if RUBY_VERSION > "2.1.0" + gem 'sqlite3' + else + gem 'sqlite3', '1.3.8' + end end platforms :jruby do gem 'activerecord-jdbcsqlite3-adapter', '~> 1.2.0' diff --git a/gemfiles/sinatra_13.gemfile b/gemfiles/sinatra_13.gemfile index f1aa680..e658153 100644 --- a/gemfiles/sinatra_13.gemfile +++ b/gemfiles/sinatra_13.gemfile @@ -14,7 +14,11 @@ gem 'capybara', '< 2.1' gem 'rubyzip', '< 1' platforms :ruby do - gem 'sqlite3', '1.3.8' + if RUBY_VERSION > "2.1.0" + gem 'sqlite3' + else + gem 'sqlite3', '1.3.8' + end end platforms :jruby do gem 'activerecord-jdbcsqlite3-adapter', '>= 1.3.0' diff --git a/gemfiles/sinatra_14.gemfile b/gemfiles/sinatra_14.gemfile index 53dff4a..da69efb 100644 --- a/gemfiles/sinatra_14.gemfile +++ b/gemfiles/sinatra_14.gemfile @@ -13,7 +13,11 @@ gem 'capybara', '< 2.1' gem 'rubyzip', '< 1' platforms :ruby do - gem 'sqlite3', '1.3.8' + if RUBY_VERSION > "2.1.0" + gem 'sqlite3' + else + gem 'sqlite3', '1.3.8' + end end platforms :jruby do gem 'activerecord-jdbcsqlite3-adapter', '>= 1.3.0'