diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index 450154a2..6d0e7934 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -16,13 +16,13 @@ jobs: strategy: fail-fast: false matrix: - ruby: [2.6, 2.7, "jruby"] + ruby: ["3.2", "3.3", "jruby"] gemfile: - - "active_support_5_0" - - "active_support_5_1" - - "active_support_5_2" - - "active_support_6_0" - - "active_support_6_1" + - "active_support_7_2" + - "active_support_8_0" + exclude: + - ruby: "jruby" + gemfile: "active_support_8_0" steps: - uses: actions/checkout@v2 - name: Set up CouchDB diff --git a/Rakefile b/Rakefile index 259e3fa9..149ddd74 100644 --- a/Rakefile +++ b/Rakefile @@ -26,8 +26,8 @@ end desc 'Run all specs for all gemfiles' task :spec do - %w(6_1 6_0 5_2 5_1 5_0).each do |version| - Bundler.with_clean_env do + %w(7_2 8_0).each do |version| + Bundler.with_original_env do puts "Running tests with ActiveSupport #{version.sub('_', '.')}" sh "env BUNDLE_GEMFILE=gemfiles/active_support_#{version} bundle install" sh "env BUNDLE_GEMFILE=gemfiles/active_support_#{version} bundle exec rake spec_unit spec_functional" diff --git a/couch_potato.gemspec b/couch_potato.gemspec index d3d4b532..0b97d42e 100644 --- a/couch_potato.gemspec +++ b/couch_potato.gemspec @@ -13,7 +13,7 @@ Gem::Specification.new do |s| s.version = CouchPotato::VERSION s.platform = Gem::Platform::RUBY - s.add_dependency 'activemodel', ['>= 5.0', '< 7.0'] + s.add_dependency 'activemodel', ['>= 7.2', '< 8.1'] s.add_dependency 'couchrest', '~>2.0.1' s.add_dependency 'json', '~> 2.3' diff --git a/gemfiles/active_support_5_1 b/gemfiles/active_support_5_1 deleted file mode 100644 index 0038c326..00000000 --- a/gemfiles/active_support_5_1 +++ /dev/null @@ -1,7 +0,0 @@ -source 'https://rubygems.org' - -gem 'activemodel', '~>5.1.7' -gem 'rails', '~>5.1.7' -gem 'execjs' - -gemspec name: 'couch_potato', path: '..' diff --git a/gemfiles/active_support_5_2 b/gemfiles/active_support_5_2 deleted file mode 100644 index 3ec48493..00000000 --- a/gemfiles/active_support_5_2 +++ /dev/null @@ -1,7 +0,0 @@ -source 'https://rubygems.org' - -gem 'activemodel', '~>5.2.3' -gem 'rails', '~>5.2.3' -gem 'execjs' - -gemspec name: 'couch_potato', path: '..' diff --git a/gemfiles/active_support_6_0 b/gemfiles/active_support_6_0 deleted file mode 100644 index cc9e7ad0..00000000 --- a/gemfiles/active_support_6_0 +++ /dev/null @@ -1,7 +0,0 @@ -source 'https://rubygems.org' - -gem 'activemodel', '~>6.0.2.2' -gem 'rails', '~>6.0.2.2' -gem 'execjs' - -gemspec name: 'couch_potato', path: '..' diff --git a/gemfiles/active_support_6_1 b/gemfiles/active_support_7_2 similarity index 64% rename from gemfiles/active_support_6_1 rename to gemfiles/active_support_7_2 index a17dcb6e..3012b062 100644 --- a/gemfiles/active_support_6_1 +++ b/gemfiles/active_support_7_2 @@ -1,7 +1,7 @@ source 'https://rubygems.org' -gem 'activemodel', '~>6.1' -gem 'rails', '~>6.1' +gem 'railties', '~>7.2.1' +gem 'activemodel' gem 'execjs' gemspec name: 'couch_potato', path: '..' diff --git a/gemfiles/active_support_5_0 b/gemfiles/active_support_8_0 similarity index 62% rename from gemfiles/active_support_5_0 rename to gemfiles/active_support_8_0 index 290a7225..dfd97b2e 100644 --- a/gemfiles/active_support_5_0 +++ b/gemfiles/active_support_8_0 @@ -1,7 +1,8 @@ source 'https://rubygems.org' -gem 'activemodel', '~>5.0.0' -gem 'rails', '~>5.0.0' + +gem 'railties', '~>8.0.1' +gem 'activemodel' gem 'execjs' gemspec name: 'couch_potato', path: '..'