Skip to content

Commit

Permalink
Merge pull request #179 from npezza93/main
Browse files Browse the repository at this point in the history
Support rails 7.2 and update gemfiles
  • Loading branch information
djmb committed Jul 22, 2024
2 parents 6682901 + e4e583b commit ba4183c
Show file tree
Hide file tree
Showing 10 changed files with 319 additions and 90 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ jobs:
strategy:
fail-fast: false
matrix:
ruby-version: ["3.0", "3.1", "3.2", "3.3"]
gemfile: [ rails_7, rails_7_1, rails_main ]
ruby-version: ["3.1", "3.2", "3.3"]
gemfile: [ rails_7, rails_7_1, rails_7_2, rails_main ]
database: [sqlite, postgres, mysql]
exclude:
- ruby-version: "3.0"
Expand Down
4 changes: 4 additions & 0 deletions Appraisals
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ appraise "rails-7-1" do
gem "railties", github: "rails/rails", branch: "7-1-stable"
end

appraise "rails-7-2" do
gem "railties", github: "rails/rails", branch: "7-2-stable"
end

appraise "rails-main" do
gem "railties", github: "rails/rails", branch: "main"
end
2 changes: 1 addition & 1 deletion app/models/solid_cache/entry.rb
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ def id_range

private
def upsert_all_no_query_cache(payloads)
args = [ self,
args = [ self.all,
connection_for_insert_all,
add_key_hash_and_byte_size(payloads) ].compact
options = { unique_by: upsert_unique_by,
Expand Down
21 changes: 21 additions & 0 deletions gemfiles/rails_7_2.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# This file was generated by Appraisal

source "https://rubygems.org"

gem "sqlite3"
gem "mysql2"
gem "pg"
gem "sprockets-rails"
gem "appraisal"
gem "railties", branch: "7-2-stable", git: "https://github.com/rails/rails.git"

group :rubocop do
gem "rubocop", ">= 1.25.1", require: false
gem "rubocop-minitest", require: false
gem "rubocop-packaging", require: false
gem "rubocop-performance", require: false
gem "rubocop-rails", require: false
gem "rubocop-md", require: false
end

gemspec path: "../"
232 changes: 232 additions & 0 deletions gemfiles/rails_7_2.gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,232 @@
GIT
remote: https://github.com/rails/rails.git
revision: c3eaf8707dd988ecfeb6bc5a8e6c2f2677a8356d
branch: 7-2-stable
specs:
actionpack (7.2.0.beta1)
actionview (= 7.2.0.beta1)
activesupport (= 7.2.0.beta1)
nokogiri (>= 1.8.5)
racc
rack (>= 2.2.4)
rack-session (>= 1.0.1)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
useragent (~> 0.16)
actionview (7.2.0.beta1)
activesupport (= 7.2.0.beta1)
builder (~> 3.1)
erubi (~> 1.11)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
activejob (7.2.0.beta1)
activesupport (= 7.2.0.beta1)
globalid (>= 0.3.6)
activemodel (7.2.0.beta1)
activesupport (= 7.2.0.beta1)
activerecord (7.2.0.beta1)
activemodel (= 7.2.0.beta1)
activesupport (= 7.2.0.beta1)
timeout (>= 0.4.0)
activesupport (7.2.0.beta1)
base64
bigdecimal
concurrent-ruby (~> 1.0, >= 1.3.1)
connection_pool (>= 2.2.5)
drb
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0, >= 2.0.5)
railties (7.2.0.beta1)
actionpack (= 7.2.0.beta1)
activesupport (= 7.2.0.beta1)
irb (~> 1.13)
rackup (>= 1.0.0)
rake (>= 12.2)
thor (~> 1.0, >= 1.2.2)
zeitwerk (~> 2.6)

PATH
remote: ..
specs:
solid_cache (0.6.0)
activejob (>= 7)
activerecord (>= 7)
railties (>= 7)

GEM
remote: https://rubygems.org/
specs:
appraisal (2.5.0)
bundler
rake
thor (>= 0.14.0)
ast (2.4.2)
base64 (0.2.0)
bigdecimal (3.1.8)
builder (3.2.4)
concurrent-ruby (1.3.1)
connection_pool (2.4.1)
crass (1.0.6)
debug (1.9.2)
irb (~> 1.10)
reline (>= 0.3.8)
drb (2.2.1)
erubi (1.12.0)
globalid (1.2.1)
activesupport (>= 6.1)
i18n (1.14.5)
concurrent-ruby (~> 1.0)
io-console (0.7.2)
irb (1.13.1)
rdoc (>= 4.0.0)
reline (>= 0.4.2)
json (2.7.2)
language_server-protocol (3.17.0.3)
loofah (2.22.0)
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
minitest (5.23.1)
mocha (2.3.0)
ruby2_keywords (>= 0.0.5)
msgpack (1.7.2)
mysql2 (0.5.6)
nokogiri (1.16.5-aarch64-linux)
racc (~> 1.4)
nokogiri (1.16.5-arm-linux)
racc (~> 1.4)
nokogiri (1.16.5-arm64-darwin)
racc (~> 1.4)
nokogiri (1.16.5-x86-linux)
racc (~> 1.4)
nokogiri (1.16.5-x86_64-darwin)
racc (~> 1.4)
nokogiri (1.16.5-x86_64-linux)
racc (~> 1.4)
parallel (1.24.0)
parser (3.3.2.0)
ast (~> 2.4.1)
racc
pg (1.5.6)
psych (5.1.2)
stringio
racc (1.8.0)
rack (3.0.11)
rack-session (2.0.0)
rack (>= 3.0.0)
rack-test (2.1.0)
rack (>= 1.3)
rackup (2.1.0)
rack (>= 3)
webrick (~> 1.8)
rails-dom-testing (2.2.0)
activesupport (>= 5.0.0)
minitest
nokogiri (>= 1.6)
rails-html-sanitizer (1.6.0)
loofah (~> 2.21)
nokogiri (~> 1.14)
rainbow (3.1.1)
rake (13.2.1)
rdoc (6.7.0)
psych (>= 4.0.0)
regexp_parser (2.9.2)
reline (0.5.8)
io-console (~> 0.5)
rexml (3.2.8)
strscan (>= 3.0.9)
rubocop (1.64.0)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
parser (>= 3.3.0.2)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8, < 3.0)
rexml (>= 3.2.5, < 4.0)
rubocop-ast (>= 1.31.1, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.31.3)
parser (>= 3.3.1.0)
rubocop-md (1.2.2)
rubocop (>= 1.0)
rubocop-minitest (0.35.0)
rubocop (>= 1.61, < 2.0)
rubocop-ast (>= 1.31.1, < 2.0)
rubocop-packaging (0.5.2)
rubocop (>= 1.33, < 2.0)
rubocop-performance (1.21.0)
rubocop (>= 1.48.1, < 2.0)
rubocop-ast (>= 1.31.1, < 2.0)
rubocop-rails (2.25.0)
activesupport (>= 4.2.0)
rack (>= 1.1)
rubocop (>= 1.33.0, < 2.0)
rubocop-ast (>= 1.31.1, < 2.0)
ruby-progressbar (1.13.0)
ruby2_keywords (0.0.5)
sprockets (4.2.1)
concurrent-ruby (~> 1.0)
rack (>= 2.2.4, < 4)
sprockets-rails (3.4.2)
actionpack (>= 5.2)
activesupport (>= 5.2)
sprockets (>= 3.0.0)
sqlite3 (2.0.2-aarch64-linux-gnu)
sqlite3 (2.0.2-aarch64-linux-musl)
sqlite3 (2.0.2-arm-linux-gnu)
sqlite3 (2.0.2-arm-linux-musl)
sqlite3 (2.0.2-arm64-darwin)
sqlite3 (2.0.2-x86-linux-gnu)
sqlite3 (2.0.2-x86-linux-musl)
sqlite3 (2.0.2-x86_64-darwin)
sqlite3 (2.0.2-x86_64-linux-gnu)
sqlite3 (2.0.2-x86_64-linux-musl)
stringio (3.1.0)
strscan (3.1.0)
thor (1.3.1)
timeout (0.4.1)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
unicode-display_width (2.5.0)
useragent (0.16.10)
webrick (1.8.1)
zeitwerk (2.6.15)

PLATFORMS
aarch64-linux
aarch64-linux-gnu
aarch64-linux-musl
arm-linux
arm-linux-gnu
arm-linux-musl
arm64-darwin
x86-linux
x86-linux-gnu
x86-linux-musl
x86_64-darwin
x86_64-linux
x86_64-linux-gnu
x86_64-linux-musl

DEPENDENCIES
appraisal
debug
mocha
msgpack
mysql2
pg
railties!
rubocop (>= 1.25.1)
rubocop-md
rubocop-minitest
rubocop-packaging
rubocop-performance
rubocop-rails
solid_cache!
sprockets-rails
sqlite3

BUNDLED WITH
2.5.9
Loading

0 comments on commit ba4183c

Please sign in to comment.