diff --git a/.gitignore b/.gitignore index 69ad9c5..8eb3b06 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,6 @@ /.bundle/ /.yardoc /Gemfile.lock -/gemfiles/*gemfile.lock /_yardoc/ /coverage/ /doc/ diff --git a/.travis.yml b/.travis.yml index 3c00062..2452e12 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,9 +5,10 @@ rvm: - 2.7.5 - 3.0.3 cache: bundler -gemfile: - - gemfiles/rails_6.0.gemfile - - gemfiles/rails_6.1.gemfile +env: + matrix: + - TEST_RAILS_VERSION=6.1 + - TEST_RAILS_VERSION=6.0 addons: postgresql: '10' before_script: diff --git a/Appraisals b/Appraisals deleted file mode 100644 index 79b31a9..0000000 --- a/Appraisals +++ /dev/null @@ -1,9 +0,0 @@ -appraise "rails-6.0" do - gem "activerecord", "~>6.0.4" - gem "activesupport", "~>6.0.4" -end - -appraise "rails-6.1" do - gem "activerecord", "~>6.1.4" - gem "activesupport", "~>6.1.4" -end diff --git a/Gemfile b/Gemfile index 33301ff..2d88fa4 100644 --- a/Gemfile +++ b/Gemfile @@ -2,3 +2,12 @@ source 'https://rubygems.org' # Specify your gem's dependencies in activerecord-id_regions.gemspec gemspec + +case ENV['TEST_RAILS_VERSION'] +when "6.0" + gem "activerecord", "~>6.0.4" + gem "activesupport", "~>6.0.4" +when "6.1" + gem "activerecord", "~>6.1.4" + gem "activesupport", "~>6.1.4" +end diff --git a/activerecord-id_regions.gemspec b/activerecord-id_regions.gemspec index db76bfd..0810e7b 100644 --- a/activerecord-id_regions.gemspec +++ b/activerecord-id_regions.gemspec @@ -24,7 +24,6 @@ Gem::Specification.new do |spec| spec.add_dependency "activesupport", ">= 5.0", "< 7.0" spec.add_dependency "pg" - spec.add_development_dependency "appraisal" spec.add_development_dependency "bundler" spec.add_development_dependency "manageiq-style" spec.add_development_dependency "rake" diff --git a/gemfiles/rails_6.0.gemfile b/gemfiles/rails_6.0.gemfile deleted file mode 100644 index 5d61bab..0000000 --- a/gemfiles/rails_6.0.gemfile +++ /dev/null @@ -1,8 +0,0 @@ -# This file was generated by Appraisal - -source "https://rubygems.org" - -gem "activerecord", "~>6.0.4" -gem "activesupport", "~>6.0.4" - -gemspec path: "../" diff --git a/gemfiles/rails_6.1.gemfile b/gemfiles/rails_6.1.gemfile deleted file mode 100644 index 5209d81..0000000 --- a/gemfiles/rails_6.1.gemfile +++ /dev/null @@ -1,8 +0,0 @@ -# This file was generated by Appraisal - -source "https://rubygems.org" - -gem "activerecord", "~>6.1.4" -gem "activesupport", "~>6.1.4" - -gemspec path: "../" diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index b12fc31..f2bdf47 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -76,3 +76,9 @@ def change create_table :test_records, :id => :bigserial end end + +require "active_record" +require "active_support" +puts +puts "\e[93mUsing ActiveRecord #{ActiveRecord.version}\e[0m" +puts "\e[93mUsing ActiveSupport #{ActiveSupport.version}\e[0m"