From cfa4f33e8cd5ed1f625ddd6ff9d3c11962988952 Mon Sep 17 00:00:00 2001 From: Nicolas Brousse Date: Wed, 22 Oct 2025 12:17:13 +0200 Subject: [PATCH] Add Rails 8.1 support --- .github/workflows/test.yml | 15 +++++++-------- Appraisals | 12 ++++-------- CHANGELOG.md | 3 ++- README.md | 4 ++-- dekorator.gemspec | 6 +++--- gemfiles/rails_7.1.x.gemfile | 14 -------------- .../{rails_7.0.x.gemfile => rails_8.1.x.gemfile} | 2 +- 7 files changed, 19 insertions(+), 37 deletions(-) delete mode 100644 gemfiles/rails_7.1.x.gemfile rename gemfiles/{rails_7.0.x.gemfile => rails_8.1.x.gemfile} (93%) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 11ae5bf..f1446f6 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -13,19 +13,18 @@ jobs: strategy: matrix: versions: - - { ruby: "3.1", rails: "7.0.x" } - - { ruby: "3.2", rails: "7.0.x" } - - { ruby: "3.3", rails: "7.0.x" } - - { ruby: "3.1", rails: "7.1.x" } - - { ruby: "3.2", rails: "7.1.x" } - - { ruby: "3.3", rails: "7.1.x" } - - { ruby: "3.1", rails: "7.2.x" } - { ruby: "3.2", rails: "7.2.x" } - { ruby: "3.3", rails: "7.2.x" } + - { ruby: "3.4", rails: "7.2.x" } - { ruby: "3.2", rails: "8.0.x" } - { ruby: "3.3", rails: "8.0.x" } + - { ruby: "3.4", rails: "8.0.x" } + - { ruby: "3.2", rails: "8.1.x" } + - { ruby: "3.3", rails: "8.1.x" } + - { ruby: "3.4", rails: "8.1.x" } - { ruby: "3.2", rails: "head" } - { ruby: "3.3", rails: "head" } + - { ruby: "3.4", rails: "head" } env: BUNDLE_GEMFILE: gemfiles/rails_${{ matrix.versions.rails }}.gemfile @@ -35,7 +34,7 @@ jobs: - name: Update gemspec to test in head version if: matrix.versions.rails == 'head' run: | - sed -i -e 's/, "< 8.1"//g' dekorator.gemspec + sed -i -e 's/, "< 8.2"//g' dekorator.gemspec - name: Set up Ruby uses: ruby/setup-ruby@v1 diff --git a/Appraisals b/Appraisals index ee0ceb1..3428402 100644 --- a/Appraisals +++ b/Appraisals @@ -1,13 +1,5 @@ # frozen_string_literal: true -appraise "rails-7.0.x" do - gem "rails", "~> 7.0.0" -end - -appraise "rails-7.1.x" do - gem "rails", "~> 7.1.0" -end - appraise "rails-7.2.x" do gem "rails", "~> 7.2.0" end @@ -16,6 +8,10 @@ appraise "rails-8.0.x" do gem "rails", "~> 8.0.0" end +appraise "rails-8.1.x" do + gem "rails", "~> 8.1.0" +end + appraise "rails-head" do gem "rails", github: "rails/rails", branch: "main" end diff --git a/CHANGELOG.md b/CHANGELOG.md index 5449ea9..657487c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] -Nothing yet. +### Added +- Add Rails 8.1 support ([#57](https://github.com/komposable/dekorator/pull/57)) ## [1.7.0] - 2024-11-10 ### Added diff --git a/README.md b/README.md index a4a5adc..763d449 100644 --- a/README.md +++ b/README.md @@ -12,8 +12,8 @@ This gem has been inspired by our Rails development practices at [Pantographe](h ## Compatibility -* Ruby 3.1+ -* Rails 7.0+ +* Ruby 3.2+ +* Rails 7.2+ ## Installation diff --git a/dekorator.gemspec b/dekorator.gemspec index c2520dd..89ffe6c 100644 --- a/dekorator.gemspec +++ b/dekorator.gemspec @@ -30,7 +30,7 @@ Gem::Specification.new do |spec| spec.required_ruby_version = Gem::Requirement.new(">= 3.1.0") - spec.add_runtime_dependency "actionview", ">= 7.0", "< 8.1" - spec.add_runtime_dependency "activerecord", ">= 7.0", "< 8.1" - spec.add_runtime_dependency "activesupport", ">= 7.0", "< 8.1" + spec.add_runtime_dependency "actionview", ">= 7.2", "< 8.2" + spec.add_runtime_dependency "activerecord", ">= 7.2", "< 8.2" + spec.add_runtime_dependency "activesupport", ">= 7.2", "< 8.2" end diff --git a/gemfiles/rails_7.1.x.gemfile b/gemfiles/rails_7.1.x.gemfile deleted file mode 100644 index fe977ab..0000000 --- a/gemfiles/rails_7.1.x.gemfile +++ /dev/null @@ -1,14 +0,0 @@ -# This file was generated by Appraisal - -source "https://rubygems.org" - -gem "rails", "~> 7.1.0" -gem "appraisal", require: false -gem "rubocop", require: false -gem "rubocop-performance", require: false -gem "rubocop-rspec", require: false -gem "rspec", require: false -gem "rspec-rails", require: false -gem "simplecov", require: false - -gemspec path: "../" diff --git a/gemfiles/rails_7.0.x.gemfile b/gemfiles/rails_8.1.x.gemfile similarity index 93% rename from gemfiles/rails_7.0.x.gemfile rename to gemfiles/rails_8.1.x.gemfile index 35a9313..d11cea6 100644 --- a/gemfiles/rails_7.0.x.gemfile +++ b/gemfiles/rails_8.1.x.gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" -gem "rails", "~> 7.0.0" +gem "rails", "~> 8.1.0" gem "appraisal", require: false gem "rubocop", require: false gem "rubocop-performance", require: false