Merge pull request #83 from FooBarWidget/rails-6

Support Rails 6; adjust testing deps

Author: chrisarcand

Appraisals

@@ -1,6 +1,10 @@
 appraise 'rails-32' do
   gem 'activerecord', '~> 3.2.21'
   gem 'actionpack', '~> 3.2.21'
+
+  platforms :ruby do
+    gem 'sqlite3', '~> 1.3.8'
+  end
 end
 
 appraise 'rails-40' do
@@ -32,3 +36,8 @@ appraise 'rails-52' do
   gem 'activerecord', '~> 5.2.0'
   gem 'actionpack', '~> 5.2.0'
 end
+
+appraise 'rails-60' do
+  gem 'activerecord', '~> 6.0.0'
+  gem 'actionpack', '~> 6.0.0'
+end

Gemfile

@@ -3,10 +3,10 @@ source 'https://rubygems.org'
 gemspec
 
 platforms :jruby do
-  gem 'activerecord-jdbcsqlite3-adapter', '~> 1.3.3'
+  gem 'activerecord-jdbcsqlite3-adapter', '>= 1.3', '< 61'
   gem 'jruby-openssl', '~> 0.9.4'
 end
 
 platforms :ruby do
-  gem 'sqlite3', '~> 1.3.8'
+  gem 'sqlite3', '~> 1.3'
 end

Rakefile

@@ -5,7 +5,18 @@ task :test do
   ruby "test.rb"
 end
 
-['3.2', '4.0', '4.1', '4.2', '5.0', '5.1', '5.2'].each do |version|
+rails_versions = %w(
+  3.2
+  4.0
+  4.1
+  4.2
+  5.0
+  5.1
+  5.2
+  6.0
+)
+
+rails_versions.each do |version|
   dotless = version.delete('.')
 
   namespace :bundle do
@@ -24,3 +35,14 @@ end
     end
   end
 end
+
+namespace :test do
+  desc "Test with all supported Rails versions"
+  task :railsall do
+    rails_versions.each do |version|
+      dotless = version.delete('.')
+      ENV['BUNDLE_GEMFILE'] = "gemfiles/rails_#{dotless}.gemfile"
+      ruby "test.rb"
+    end
+  end
+end

default_value_for.gemspec

@@ -14,10 +14,10 @@ Gem::Specification.new do |s|
     'lib/default_value_for.rb',
     'lib/default_value_for/railtie.rb'
   ]
-  s.add_dependency 'activerecord', '>= 3.2.0', '< 6.0'
-  s.add_development_dependency 'railties', '>= 3.2.0', '< 6.0'
+  s.add_dependency 'activerecord', '>= 3.2.0', '< 6.1'
+  s.add_development_dependency 'actionpack', '>= 3.2.0', '< 6.1'
+  s.add_development_dependency 'railties', '>= 3.2.0', '< 6.1'
   s.add_development_dependency 'minitest', '>= 4.2'
   s.add_development_dependency 'minitest-around'
   s.add_development_dependency 'appraisal'
-  s.add_development_dependency 'actionpack', '>= 3.2.0', '< 6.0'
 end

gemfiles/rails_32.gemfile

@@ -6,7 +6,7 @@ gem "activerecord", "~> 3.2.21"
 gem "actionpack", "~> 3.2.21"
 
 platforms :jruby do
-  gem "activerecord-jdbcsqlite3-adapter", "~> 1.3.3"
+  gem "activerecord-jdbcsqlite3-adapter", ">= 1.3", "< 61"
   gem "jruby-openssl", "~> 0.9.4"
 end
 

gemfiles/rails_40.gemfile

@@ -6,12 +6,12 @@ gem "activerecord", "~> 4.0.12"
 gem "actionpack", "~> 4.0.12"
 
 platforms :jruby do
-  gem "activerecord-jdbcsqlite3-adapter", "~> 1.3.3"
+  gem "activerecord-jdbcsqlite3-adapter", ">= 1.3", "< 61"
   gem "jruby-openssl", "~> 0.9.4"
 end
 
 platforms :ruby do
-  gem "sqlite3", "~> 1.3.8"
+  gem "sqlite3", ">= 1.3", "< 2.0"
 end
 
 gemspec path: "../"

gemfiles/rails_41.gemfile

@@ -6,12 +6,12 @@ gem "activerecord", "~> 4.1.8"
 gem "actionpack", "~> 4.1.8"
 
 platforms :jruby do
-  gem "activerecord-jdbcsqlite3-adapter", "~> 1.3.3"
+  gem "activerecord-jdbcsqlite3-adapter", ">= 1.3", "< 61"
   gem "jruby-openssl", "~> 0.9.4"
 end
 
 platforms :ruby do
-  gem "sqlite3", "~> 1.3.8"
+  gem "sqlite3", ">= 1.3", "< 2.0"
 end
 
 gemspec path: "../"

gemfiles/rails_42.gemfile

@@ -6,12 +6,12 @@ gem "activerecord", "~> 4.2.0"
 gem "actionpack", "~> 4.2.0"
 
 platforms :jruby do
-  gem "activerecord-jdbcsqlite3-adapter", "~> 1.3.3"
+  gem "activerecord-jdbcsqlite3-adapter", ">= 1.3", "< 61"
   gem "jruby-openssl", "~> 0.9.4"
 end
 
 platforms :ruby do
-  gem "sqlite3", "~> 1.3.8"
+  gem "sqlite3", ">= 1.3", "< 2.0"
 end
 
 gemspec path: "../"

gemfiles/rails_50.gemfile

@@ -6,12 +6,12 @@ gem "activerecord", "~> 5.0.0"
 gem "actionpack", "~> 5.0.0"
 
 platforms :jruby do
-  gem "activerecord-jdbcsqlite3-adapter", "~> 1.3.3"
+  gem "activerecord-jdbcsqlite3-adapter", ">= 1.3", "< 61"
   gem "jruby-openssl", "~> 0.9.4"
 end
 
 platforms :ruby do
-  gem "sqlite3", "~> 1.3.8"
+  gem "sqlite3", ">= 1.3", "< 2.0"
 end
 
 gemspec path: "../"

gemfiles/rails_51.gemfile

@@ -6,12 +6,12 @@ gem "activerecord", "~> 5.1.0"
 gem "actionpack", "~> 5.1.0"
 
 platforms :jruby do
-  gem "activerecord-jdbcsqlite3-adapter", "~> 1.3.3"
+  gem "activerecord-jdbcsqlite3-adapter", ">= 1.3", "< 61"
   gem "jruby-openssl", "~> 0.9.4"
 end
 
 platforms :ruby do
-  gem "sqlite3", "~> 1.3.8"
+  gem "sqlite3", ">= 1.3", "< 2.0"
 end
 
 gemspec path: "../"