Skip to content

Commit

Permalink
Add Rails 7.1 support (#2336)
Browse files Browse the repository at this point in the history
  • Loading branch information
@camertron
camertron committed Oct 27, 2023
1 parent c3f2fbb commit 94db2c4
Show file tree
Hide file tree
Showing 10 changed files with 178 additions and 105 deletions.
5 changes: 5 additions & 0 deletions .changeset/short-buses-think.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@primer/view-components': minor
---

Add Rails 7.1 support
6 changes: 6 additions & 0 deletions .github/workflows/test.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ jobs:
ruby_version: "2.7"
- rails_version: "7.0.3"
ruby_version: "3.0"
- rails_version: "7.1.1"
ruby_version: "3.2"
- rails_version: "main"
ruby_version: "3.1"
- rails_version: "main"
Expand Down Expand Up @@ -93,6 +95,8 @@ jobs:
ruby_version: "2.7"
- rails_version: "7.0.3"
ruby_version: "3.0"
- rails_version: "7.1.1"
ruby_version: "3.2"
- rails_version: "main"
ruby_version: "3.1"
- rails_version: "main"
Expand Down Expand Up @@ -135,6 +139,8 @@ jobs:
ruby_version: "2.7"
- rails_version: "7.0.3"
ruby_version: "3.0"
- rails_version: "7.1.1"
ruby_version: "3.2"
- rails_version: "main"
ruby_version: "3.1"
- rails_version: "main"
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
source "https://rubygems.org"

gemspec
rails_version = (ENV["RAILS_VERSION"] || "7.0.3").to_s
rails_version = (ENV["RAILS_VERSION"] || "7.1.1").to_s

# remove when https://github.com/rails/rails/pull/47142 is merged
gem "rack", "~> 2.2"
Expand Down
156 changes: 94 additions & 62 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,40 +10,49 @@ PATH
GEM
remote: https://rubygems.org/
specs:
actionpack (7.0.3)
actionview (= 7.0.3)
activesupport (= 7.0.3)
rack (~> 2.0, >= 2.2.0)
actionpack (7.1.1)
actionview (= 7.1.1)
activesupport (= 7.1.1)
nokogiri (>= 1.8.5)
rack (>= 2.2.4)
rack-session (>= 1.0.1)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actionview (7.0.3)
activesupport (= 7.0.3)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
actionview (7.1.1)
activesupport (= 7.1.1)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
activemodel (7.0.3)
activesupport (= 7.0.3)
activesupport (7.0.3)
erubi (~> 1.11)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
activemodel (7.1.1)
activesupport (= 7.1.1)
activesupport (7.1.1)
base64
bigdecimal
concurrent-ruby (~> 1.0, >= 1.0.2)
connection_pool (>= 2.2.5)
drb
i18n (>= 1.6, < 2)
minitest (>= 5.1)
mutex_m
tzinfo (~> 2.0)
addressable (2.8.1)
addressable (2.8.5)
public_suffix (>= 2.0.2, < 6.0)
allocation_stats (0.1.5)
allocation_tracer (0.6.3)
ansi (1.5.0)
ast (2.4.2)
base64 (0.1.1)
benchmark-ips (2.8.4)
better_html (2.0.1)
better_html (2.0.2)
actionview (>= 6.0)
activesupport (>= 6.0)
ast (~> 2.0)
erubi (~> 1.4)
parser (>= 2.4)
smart_properties
bigdecimal (3.1.4)
bootsnap (1.16.0)
msgpack (~> 1.2)
builder (3.2.4)
Expand All @@ -58,6 +67,7 @@ GEM
xpath (~> 3.2)
coderay (1.1.3)
concurrent-ruby (1.2.2)
connection_pool (2.4.1)
crack (0.4.5)
rexml
crass (1.0.6)
Expand All @@ -67,6 +77,8 @@ GEM
capybara (~> 3.0)
ferrum (~> 0.13.0)
docile (1.4.0)
drb (2.1.1)
ruby2_keywords
erb_lint (0.4.0)
activesupport
better_html (>= 2.0.1)
Expand All @@ -81,20 +93,24 @@ GEM
concurrent-ruby (~> 1.1)
webrick (~> 1.7)
websocket-driver (>= 0.6, < 0.8)
ffi (1.15.5)
ffi (1.16.3)
hashdiff (1.0.1)
htmlbeautifier (1.4.2)
htmlentities (4.3.4)
i18n (1.12.0)
i18n (1.14.1)
concurrent-ruby (~> 1.0)
io-console (0.6.0)
irb (1.8.3)
rdoc
reline (>= 0.3.8)
kramdown (2.4.0)
rexml
listen (3.8.0)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
loofah (2.19.1)
loofah (2.21.4)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
nokogiri (>= 1.12.0)
lookbook (2.1.1)
activemodel
css_parser
Expand All @@ -110,57 +126,73 @@ GEM
marcel (1.0.2)
matrix (0.4.2)
method_source (1.0.0)
mini_mime (1.1.2)
mini_portile2 (2.8.1)
mini_mime (1.1.5)
mini_portile2 (2.8.5)
minitest (5.20.0)
mocha (2.1.0)
ruby2_keywords (>= 0.0.5)
msgpack (1.7.0)
msgpack (1.7.2)
mutex_m (0.1.2)
nio4r (2.5.9)
nokogiri (1.14.0)
mini_portile2 (~> 2.8.0)
nokogiri (1.15.4)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
nokogiri (1.14.0-x86_64-linux)
nokogiri (1.15.4-x86_64-linux)
racc (~> 1.4)
octicons (19.8.0)
parallel (1.22.1)
parser (3.2.0.0)
parallel (1.23.0)
parser (3.2.2.4)
ast (~> 2.4.1)
racc
pry (0.14.2)
coderay (~> 1.1)
method_source (~> 1.0)
public_suffix (5.0.1)
psych (5.1.1.1)
stringio
public_suffix (5.0.3)
puma (6.4.0)
nio4r (~> 2.0)
racc (1.6.2)
racc (1.7.1)
rack (2.2.8)
rack-cors (2.0.1)
rack (>= 2.0.0)
rack-proxy (0.7.6)
rack-proxy (0.7.7)
rack
rack-test (2.0.2)
rack-session (1.0.1)
rack (< 3)
rack-test (2.1.0)
rack (>= 1.3)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
rackup (1.0.0)
rack (< 3)
webrick
rails-dom-testing (2.2.0)
activesupport (>= 5.0.0)
minitest
nokogiri (>= 1.6)
rails-html-sanitizer (1.5.0)
loofah (~> 2.19, >= 2.19.1)
railties (7.0.3)
actionpack (= 7.0.3)
activesupport (= 7.0.3)
method_source
rails-html-sanitizer (1.6.0)
loofah (~> 2.21)
nokogiri (~> 1.14)
railties (7.1.1)
actionpack (= 7.1.1)
activesupport (= 7.1.1)
irb
rackup (>= 1.0.0)
rake (>= 12.2)
thor (~> 1.0)
zeitwerk (~> 2.5)
thor (~> 1.0, >= 1.2.2)
zeitwerk (~> 2.6)
rainbow (3.1.1)
rake (13.0.6)
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
ffi (~> 1.0)
rdoc (6.5.0)
psych (>= 4.0.0)
redcarpet (3.6.0)
regexp_parser (2.6.2)
rexml (3.2.5)
rouge (4.1.3)
regexp_parser (2.8.2)
reline (0.3.9)
io-console (~> 0.5)
rexml (3.2.6)
rouge (4.2.0)
rubocop (1.13.0)
parallel (~> 1.10)
parser (>= 3.0.0.0)
Expand All @@ -170,8 +202,8 @@ GEM
rubocop-ast (>= 1.2.0, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 3.0)
rubocop-ast (1.24.1)
parser (>= 3.1.1.0)
rubocop-ast (1.30.0)
parser (>= 3.2.1.0)
rubocop-github (0.16.2)
rubocop (<= 1.13.0)
rubocop-performance (<= 1.11.0)
Expand All @@ -185,7 +217,7 @@ GEM
rubocop (>= 0.87.0)
rubocop-rails-accessibility (0.2.0)
rubocop (>= 1.0.0)
ruby-progressbar (1.11.0)
ruby-progressbar (1.13.0)
ruby2_keywords (0.0.5)
semantic_range (3.0.0)
simplecov (0.22.0)
Expand All @@ -207,44 +239,44 @@ GEM
actionpack (>= 5.2)
activesupport (>= 5.2)
sprockets (>= 3.0.0)
stringio (3.0.8)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
thor (1.3.0)
timecop (0.9.6)
timecop (0.9.8)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
unicode-display_width (2.4.2)
view_component (3.1.0)
unicode-display_width (2.5.0)
view_component (3.6.0)
activesupport (>= 5.2.0, < 8.0)
concurrent-ruby (~> 1.0)
method_source (~> 1.0)
webmock (3.18.1)
webmock (3.19.1)
addressable (>= 2.8.0)
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
webpacker (5.4.3)
webpacker (5.4.4)
activesupport (>= 5.2)
rack-proxy (>= 0.6.1)
railties (>= 5.2)
semantic_range (>= 2.3.0)
webrick (1.7.0)
websocket-driver (0.7.5)
webrick (1.8.1)
websocket-driver (0.7.6)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
xpath (3.2.0)
nokogiri (~> 1.8)
yard (0.9.28)
webrick (~> 1.7.0)
zeitwerk (2.6.6)
yard (0.9.34)
zeitwerk (2.6.12)

PLATFORMS
ruby
x86_64-linux

DEPENDENCIES
actionview (= 7.0.3)
activemodel (= 7.0.3)
activesupport (= 7.0.3)
actionview (= 7.1.1)
activemodel (= 7.1.1)
activesupport (= 7.1.1)
allocation_stats (~> 0.1)
allocation_tracer (~> 0.6.3)
benchmark-ips (~> 2.8.4)
Expand All @@ -264,7 +296,7 @@ DEPENDENCIES
puma (~> 6.4.0)
rack (~> 2.2)
rack-cors
railties (= 7.0.3)
railties (= 7.1.1)
rake (~> 13.0)
rubocop (= 1.13.0)
rubocop-github (~> 0.16.0)
Expand Down
2 changes: 1 addition & 1 deletion demo/Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

source "https://rubygems.org"

rails_version = (ENV["RAILS_VERSION"] || "7.0.3").to_s
rails_version = (ENV["RAILS_VERSION"] || "7.1.1").to_s

gem "rake", "~> 13.0"
gem "rack-cors"
Expand Down
Loading

0 comments on commit 94db2c4

Please sign in to comment.