Skip to content

Commit

Permalink
Merge pull request #17 from insales/rails71
Browse files Browse the repository at this point in the history 
Allow rails 7.1
  • Loading branch information
@Vasfed
Vasfed authored Oct 23, 2023
2 parents 70a5f73 + 3858036 commit cd41699
Show file tree
Hide file tree
Showing 16 changed files with 415 additions and 346 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/test.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ jobs:

strategy:
matrix:
ruby-version: [2.7.5, 3.0.4, 3.1.2]
rails-version: [70]
ruby-version: [3.2.2]
rails-version: [70, 71]
include:
- ruby-version: 2.6.6
- ruby-version: 2.7.8
rails-version: 52
- ruby-version: 2.7.5
- ruby-version: 2.7.8
rails-version: 60
- ruby-version: 2.7.5
- ruby-version: 2.7.8
rails-version: 61

env:
Expand All @@ -39,4 +39,4 @@ jobs:

- name: Run tests
run: |
bundle exec appraisal rails_${{ matrix.rails-version }} rspec
bundle exec rspec
12 changes: 8 additions & 4 deletions Appraisals
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,21 @@
# frozen_string_literal: true

appraise 'rails_52' do
gem 'activerecord', '~> 5.2.6'
gem 'activerecord', '~>5.2.8'
end

appraise 'rails_60' do
gem 'activerecord', '~> 6.0.4.4'
gem 'activerecord', '~> 6.0.6'
end

appraise 'rails_61' do
gem 'activerecord', '~>6.1.4.4'
gem 'activerecord', '~>6.1.7'
end

appraise 'rails_70' do
gem 'activerecord', '~>7.0.0'
gem 'activerecord', '~>7.0.8'
end

appraise 'rails_71' do
gem 'activerecord', '~>7.1.1'
end
14 changes: 8 additions & 6 deletions Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,15 @@ source 'http://rubygems.org'

gemspec

gem 'pg', '~> 1.1.4'
gem 'pg', '~> 1.1'
gem 'sqlite3'
gem 'rspec'

gem 'awesome_print'
gem 'pry'
gem 'pry-byebug'
gem 'pry-doc'
unless defined?(Appraisal)
gem 'appraisal', require: false

gem 'appraisal', require: false
gem 'awesome_print'
gem 'pry'
gem 'pry-byebug'
gem 'pry-doc'
end
4 changes: 2 additions & 2 deletions delayed_job.gemspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ Gem::Specification.new do |s|
s.description = "Delated_job (or DJ) encapsulates the common pattern of asynchronously executing longer tasks in the background. It is a direct extraction from Shopify where the job table is responsible for a multitude of core tasks."
s.authors = ["Tobias Lütke"]

s.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^spec/}) }
s.files = `git ls-files -z`.split("\x0").reject { |file| file.start_with?('.') || file.match(%r{^spec/}) }
s.require_paths = ['lib']

s.add_dependency 'activerecord', '>= 3.2', '< 7.1'
s.add_dependency 'activerecord', '>= 3.2', '< 7.2'
s.add_dependency 'railties'

s.add_development_dependency 'bundler'
Expand Down
9 changes: 2 additions & 7 deletions gemfiles/rails_52.gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,9 @@

source "http://rubygems.org"

gem "pg", "~> 1.1.4"
gem "pg", "~> 1.1"
gem "sqlite3"
gem "rspec"
gem "awesome_print"
gem "pry"
gem "pry-byebug"
gem "pry-doc"
gem "appraisal", require: false
gem "activerecord", "~> 5.2.6"
gem "activerecord", "~>5.2.8"

gemspec path: "../"
129 changes: 56 additions & 73 deletions gemfiles/rails_52.gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,125 +2,108 @@ PATH
remote: ..
specs:
delayed_job (1.7.0)
activerecord (>= 3.2, < 7.1)
activerecord (>= 3.2, < 7.2)
railties

GEM
remote: http://rubygems.org/
specs:
actionpack (5.2.7)
actionview (= 5.2.7)
activesupport (= 5.2.7)
actionpack (5.2.8.1)
actionview (= 5.2.8.1)
activesupport (= 5.2.8.1)
rack (~> 2.0, >= 2.0.8)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.2.7)
activesupport (= 5.2.7)
actionview (5.2.8.1)
activesupport (= 5.2.8.1)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activemodel (5.2.7)
activesupport (= 5.2.7)
activerecord (5.2.7)
activemodel (= 5.2.7)
activesupport (= 5.2.7)
activemodel (5.2.8.1)
activesupport (= 5.2.8.1)
activerecord (5.2.8.1)
activemodel (= 5.2.8.1)
activesupport (= 5.2.8.1)
arel (>= 9.0)
activesupport (5.2.7)
activesupport (5.2.8.1)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
appraisal (2.4.1)
bundler
rake
thor (>= 0.14.0)
arel (9.0.0)
awesome_print (1.9.2)
builder (3.2.4)
byebug (11.1.3)
coderay (1.1.3)
concurrent-ruby (1.1.10)
concurrent-ruby (1.2.2)
crass (1.0.6)
diff-lcs (1.5.0)
erubi (1.10.0)
i18n (1.10.0)
erubi (1.12.0)
i18n (1.14.1)
concurrent-ruby (~> 1.0)
loofah (2.16.0)
loofah (2.21.4)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
nokogiri (>= 1.12.0)
method_source (1.0.0)
minitest (5.15.0)
nokogiri (1.13.4-x86_64-darwin)
minitest (5.20.0)
nokogiri (1.15.4-arm64-darwin)
racc (~> 1.4)
nokogiri (1.13.4-x86_64-linux)
nokogiri (1.15.4-x86_64-darwin)
racc (~> 1.4)
pg (1.1.4)
pry (0.14.1)
coderay (~> 1.1)
method_source (~> 1.0)
pry-byebug (3.8.0)
byebug (~> 11.0)
pry (~> 0.10)
pry-doc (1.3.0)
pry (~> 0.11)
yard (~> 0.9.11)
racc (1.6.0)
rack (2.2.3)
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (1.15.4-x86_64-linux)
racc (~> 1.4)
pg (1.5.4)
racc (1.7.1)
rack (2.2.8)
rack-test (2.1.0)
rack (>= 1.3)
rails-dom-testing (2.2.0)
activesupport (>= 5.0.0)
minitest
nokogiri (>= 1.6)
rails-html-sanitizer (1.4.2)
loofah (~> 2.3)
railties (5.2.7)
actionpack (= 5.2.7)
activesupport (= 5.2.7)
rails-html-sanitizer (1.6.0)
loofah (~> 2.21)
nokogiri (~> 1.14)
railties (5.2.8.1)
actionpack (= 5.2.8.1)
activesupport (= 5.2.8.1)
method_source
rake (>= 0.8.7)
thor (>= 0.19.0, < 2.0)
rake (13.0.6)
rspec (3.11.0)
rspec-core (~> 3.11.0)
rspec-expectations (~> 3.11.0)
rspec-mocks (~> 3.11.0)
rspec-core (3.11.0)
rspec-support (~> 3.11.0)
rspec-expectations (3.11.0)
rspec (3.12.0)
rspec-core (~> 3.12.0)
rspec-expectations (~> 3.12.0)
rspec-mocks (~> 3.12.0)
rspec-core (3.12.2)
rspec-support (~> 3.12.0)
rspec-expectations (3.12.3)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.11.0)
rspec-mocks (3.11.1)
rspec-support (~> 3.12.0)
rspec-mocks (3.12.6)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.11.0)
rspec-support (3.11.0)
sqlite3 (1.4.2)
thor (1.2.1)
rspec-support (~> 3.12.0)
rspec-support (3.12.1)
sqlite3 (1.6.7-arm64-darwin)
sqlite3 (1.6.7-x86_64-darwin)
sqlite3 (1.6.7-x86_64-linux)
thor (1.3.0)
thread_safe (0.3.6)
tzinfo (1.2.9)
tzinfo (1.2.11)
thread_safe (~> 0.1)
webrick (1.7.0)
yard (0.9.27)
webrick (~> 1.7.0)

PLATFORMS
arm64-darwin-22
x86_64-darwin-21
x86_64-linux

DEPENDENCIES
activerecord (~> 5.2.6)
appraisal
awesome_print
activerecord (~> 5.2.8)
bundler
delayed_job!
pg (~> 1.1.4)
pry
pry-byebug
pry-doc
pg (~> 1.1)
rake
rspec
sqlite3

BUNDLED WITH
2.3.10
2.4.19
9 changes: 2 additions & 7 deletions gemfiles/rails_60.gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,9 @@

source "http://rubygems.org"

gem "pg", "~> 1.1.4"
gem "pg", "~> 1.1"
gem "sqlite3"
gem "rspec"
gem "awesome_print"
gem "pry"
gem "pry-byebug"
gem "pry-doc"
gem "appraisal", require: false
gem "activerecord", "~> 6.0.4.4"
gem "activerecord", "~> 6.0.6"

gemspec path: "../"
Loading

0 comments on commit cd41699

Please sign in to comment.