Skip to content

Commit 9d90359

Browse files
authored
Only lock to concurrent-ruby 1.3.4 for Rails 6.1. (#2271)
* Only lock to concurrent-ruby 1.3.4 for Rails 6.1. * fix appraisal? * lint
1 parent 5037d80 commit 9d90359

File tree

5 files changed

+12
-2
lines changed

5 files changed

+12
-2
lines changed

Appraisals

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ appraise "rails-6.1" do
44
gem "rails", "~> 6.1"
55
gem "tailwindcss-rails", "~> 2.0"
66
gem "sprockets-rails", "~> 3.4.2"
7+
gem "concurrent-ruby", "1.3.4"
78

89
# Required for Ruby 3.1.0
910
gem "net-smtp", require: false

Gemfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ PATH
33
specs:
44
view_component (3.22.0)
55
activesupport (>= 5.2.0, < 8.1)
6-
concurrent-ruby (= 1.3.4)
6+
concurrent-ruby (~> 1)
77
method_source (~> 1.0)
88

99
GEM

docs/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ nav_order: 6
1010

1111
## main
1212

13+
* Only lock to `concurrent-ruby` `1.3.4` for Rails 6.1.
14+
15+
*Joel Hawksley*
16+
1317
* Fix generation of ViewComponent documentation that was broken due to HTML safety issues.
1418

1519
*Simon Fish*

gemfiles/rails_6.1.gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,6 @@ gem "net-imap", require: false
99
gem "net-pop", require: false
1010
gem "turbo-rails", "~> 1"
1111
gem "sprockets-rails", "~> 3.4.2"
12+
gem "concurrent-ruby", "1.3.4"
1213

1314
gemspec path: "../"

view_component.gemspec

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,11 @@ Gem::Specification.new do |spec|
3131

3232
spec.add_runtime_dependency "activesupport", [">= 5.2.0", "< 8.1"]
3333
spec.add_runtime_dependency "method_source", "~> 1.0"
34-
spec.add_runtime_dependency "concurrent-ruby", "1.3.4" # lock version that supports Rails 6.1
34+
if ENV["RAILS_VERSION"] == "6.1"
35+
spec.add_runtime_dependency "concurrent-ruby", "1.3.4" # lock version that supports Rails 6.1
36+
else
37+
spec.add_runtime_dependency "concurrent-ruby", "~> 1"
38+
end
3539
spec.add_development_dependency "allocation_stats", "~> 0.1.5"
3640
spec.add_development_dependency "appraisal", "~> 2.4"
3741
spec.add_development_dependency "benchmark-ips", "~> 2.13.0"

0 commit comments

Comments
 (0)