From 6541c3ebd34656ed0ffb8ca48e9da39df427feca Mon Sep 17 00:00:00 2001 From: Stuart Chinery Date: Thu, 5 Oct 2023 14:26:56 +0100 Subject: [PATCH 1/3] Update gem requirement to allow Rails 7.1 --- .github/workflows/ci.yml | 8 +++++--- active_model_serializers.gemspec | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b02f6a0a1..93be8fb82 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,12 +13,14 @@ jobs: matrix: include: # Recent Rubies and Rails + - ruby-version: '3.2' + rails-version: '7.1' - ruby-version: '3.1' - rails-version: '7.0' + rails-version: '7.1' - ruby-version: '3.0' - rails-version: '7.0' + rails-version: '7.1' - ruby-version: '2.7' - rails-version: '7.0' + rails-version: '7.1' - ruby-version: '2.6' rails-version: '6.1' - ruby-version: '2.6' diff --git a/active_model_serializers.gemspec b/active_model_serializers.gemspec index 2d1855e8d..ec2930cc8 100644 --- a/active_model_serializers.gemspec +++ b/active_model_serializers.gemspec @@ -21,7 +21,7 @@ Gem::Specification.new do |spec| spec.required_ruby_version = '>= 2.1' - rails_versions = ['>= 4.1', '< 7.1'] + rails_versions = ['>= 4.1', '< 7.2'] spec.add_runtime_dependency 'activemodel', rails_versions # 'activesupport', rails_versions # 'builder' From 3f628ba0b7a1e90efe5fc762380a0443a58e075e Mon Sep 17 00:00:00 2001 From: Stuart Chinery Date: Thu, 5 Oct 2023 19:33:18 +0100 Subject: [PATCH 2/3] Add rdoc to Gemfile --- Gemfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Gemfile b/Gemfile index e3ceac989..e30d1d431 100644 --- a/Gemfile +++ b/Gemfile @@ -88,6 +88,7 @@ end group :development, :test do if RUBY_VERSION < '3.0' gem 'rubocop', '~> 0.40.0', require: false + gem 'rdoc', '6.3.3', require: false else gem 'rubocop', '~> 1.56.0', require: false gem 'rubocop-minitest', '~> 0.31.0', require: false From 511901a22d7511f8439578b2d8360758958f7889 Mon Sep 17 00:00:00 2001 From: Stuart Chinery <163900+schinery@users.noreply.github.com> Date: Thu, 5 Oct 2023 19:48:40 +0100 Subject: [PATCH 3/3] Remove upper limit of Rails version Co-authored-by: Andreas Finger --- active_model_serializers.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/active_model_serializers.gemspec b/active_model_serializers.gemspec index ec2930cc8..602cec3fc 100644 --- a/active_model_serializers.gemspec +++ b/active_model_serializers.gemspec @@ -21,7 +21,7 @@ Gem::Specification.new do |spec| spec.required_ruby_version = '>= 2.1' - rails_versions = ['>= 4.1', '< 7.2'] + rails_versions = ['>= 4.1'] spec.add_runtime_dependency 'activemodel', rails_versions # 'activesupport', rails_versions # 'builder'