From 2eae20a0c94c7fd6c5eede93588d4f788a5de421 Mon Sep 17 00:00:00 2001 From: Vasily Fedoseyev Date: Mon, 23 Oct 2023 19:44:59 +0300 Subject: [PATCH] Allow rails 7.1 --- .github/workflows/test.yaml | 3 ++- Appraisals | 6 +++++- gemfiles/rails_70.gemfile | 2 +- gemfiles/rails_71.gemfile | 19 +++++++++++++++++++ paperclip.gemspec | 2 +- 5 files changed, 28 insertions(+), 4 deletions(-) create mode 100644 gemfiles/rails_71.gemfile diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 74138e2..53fa22b 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -13,9 +13,10 @@ jobs: rails-version: 60 - ruby-version: 2.7.8 rails-version: 61 - # EDGE - ruby-version: 3.2.2 rails-version: 70 + - ruby-version: 3.2.2 + rails-version: 71 env: BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/rails_${{ matrix.rails-version }}.gemfile diff --git a/Appraisals b/Appraisals index c0b3d04..40bc0c0 100644 --- a/Appraisals +++ b/Appraisals @@ -9,5 +9,9 @@ appraise 'rails_61' do end appraise 'rails_70' do - gem 'rails', '~>7.0.0' + gem 'rails', '~>7.0.8' +end + +appraise 'rails_71' do + gem 'rails', '~>7.1.1' end diff --git a/gemfiles/rails_70.gemfile b/gemfiles/rails_70.gemfile index 43d836e..c1b94b7 100644 --- a/gemfiles/rails_70.gemfile +++ b/gemfiles/rails_70.gemfile @@ -7,7 +7,7 @@ gem "pg" gem "aws-sdk-s3" gem "fog-local" gem "delayed_paperclip", git: "https://github.com/insales/delayed_paperclip.git" -gem "rails", "~>7.0.0" +gem "rails", "~>7.0.8" gem "sidekiq" gem "test-unit" gem "mocha" diff --git a/gemfiles/rails_71.gemfile b/gemfiles/rails_71.gemfile new file mode 100644 index 0000000..e5e35d6 --- /dev/null +++ b/gemfiles/rails_71.gemfile @@ -0,0 +1,19 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "fastimage" +gem "pg" +gem "aws-sdk-s3" +gem "fog-local" +gem "delayed_paperclip", git: "https://github.com/insales/delayed_paperclip.git" +gem "rails", "~>7.1.1" +gem "sidekiq" +gem "test-unit" +gem "mocha" +gem "thoughtbot-shoulda", ">= 2.9.0" +gem "pry" +gem "pry-byebug" +gem "addressable" + +gemspec path: "../" diff --git a/paperclip.gemspec b/paperclip.gemspec index 834461d..21cfcdb 100644 --- a/paperclip.gemspec +++ b/paperclip.gemspec @@ -16,7 +16,7 @@ Gem::Specification.new do |s| s.rubyforge_project = %q{paperclip} s.summary = %q{File attachments as attributes for ActiveRecord} - s.add_dependency 'activesupport', '< 7.1' + s.add_dependency 'activesupport', '< 7.2' s.add_dependency 'addressable' s.add_dependency 'fastimage' end