Skip to content

Commit 7c59626

Browse files
JonRoweJonRowe
committed
Update supported versions
1 parent b11feaf commit 7c59626

File tree

4 files changed

+10
-66
lines changed

4 files changed

+10
-66
lines changed

‎.github/workflows/ci.yml

Lines changed: 0 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -70,55 +70,6 @@ jobs:
7070
- ruby: 2.5
7171
env:
7272
RAILS_VERSION: '~> 6.1.0'
73-
- ruby: jruby-9.3.1.0
74-
env:
75-
RAILS_VERSION: '~> 6.1.0'
76-
JRUBY_OPT: '--dev'
77-
JAVA_OPTS: '--add-opens java.base/sun.nio.ch=org.jruby.dist --add-opens java.base/java.io=org.jruby.dist --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.security=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.security.cert=ALL-UNNAMED --add-opens=java.base/java.util.zip=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.util.regex=ALL-UNNAMED --add-opens=java.base/java.net=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/javax.crypto=ALL-UNNAMED --add-opens=java.management/sun.management=ALL-UNNAMED'
78-
79-
# Rails 6.0 builds >= 2.5.0
80-
- ruby: '3.0'
81-
env:
82-
RAILS_VERSION: '~> 6.0.0'
83-
- ruby: 2.7
84-
env:
85-
RAILS_VERSION: '~> 6.0.0'
86-
- ruby: 2.6
87-
env:
88-
RAILS_VERSION: '~> 6.0.0'
89-
- ruby: 2.5
90-
env:
91-
RAILS_VERSION: '~> 6.0.0'
92-
- ruby: jruby-9.3.1.0
93-
env:
94-
RAILS_VERSION: '~> 6.0.0'
95-
JRUBY_OPT: '--dev'
96-
JAVA_OPTS: '--add-opens java.base/sun.nio.ch=org.jruby.dist --add-opens java.base/java.io=org.jruby.dist --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.security=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.security.cert=ALL-UNNAMED --add-opens=java.base/java.util.zip=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.util.regex=ALL-UNNAMED --add-opens=java.base/java.net=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/javax.crypto=ALL-UNNAMED --add-opens=java.management/sun.management=ALL-UNNAMED'
97-
98-
# Rails 5.2 builds >= 2.2.2
99-
- ruby: 2.6.6
100-
env:
101-
RAILS_VERSION: '~> 5.2.0'
102-
- ruby: 2.5.8
103-
env:
104-
RAILS_VERSION: '~> 5.2.0'
105-
- ruby: 2.4.10
106-
env:
107-
RAILS_VERSION: '~> 5.2.0'
108-
- ruby: 2.3.8
109-
env:
110-
RAILS_VERSION: '~> 5.2.0'
111-
- ruby: 2.2.10
112-
env:
113-
RAILS_VERSION: '~> 5.2.0'
114-
- ruby: 2.2.10
115-
env:
116-
RAILS_VERSION: '5-2-stable'
117-
- ruby: jruby-9.3.1.0
118-
env:
119-
RAILS_VERSION: '~> 5.2.0'
120-
JRUBY_OPT: '--dev'
121-
JAVA_OPTS: '--add-opens java.base/sun.nio.ch=org.jruby.dist --add-opens java.base/java.io=org.jruby.dist --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.security=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.security.cert=ALL-UNNAMED --add-opens=java.base/java.util.zip=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.util.regex=ALL-UNNAMED --add-opens=java.base/java.net=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/javax.crypto=ALL-UNNAMED --add-opens=java.management/sun.management=ALL-UNNAMED'
12273

12374
env: ${{ matrix.env }}
12475
steps:

‎Gemfile-rails-dependencies

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,23 +26,14 @@ when /stable$/
2626
gem rails_gem, :git => "https://github.com/rails/rails.git", :branch => version
2727
end
2828
when nil, false, ""
29-
add_net_gems_dependency # TODO: remove when we use switch to "~> 7.0.0" that declares dependency on those gems on itself
30-
gem "rails", "~> 6.0.0"
29+
gem "rails", "~> 7.0.0"
3130
gem "puma"
3231
gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
3332
gem 'selenium-webdriver', require: false
3433
else
35-
rails_version = version.split(' ').last
36-
37-
add_net_gems_dependency if rails_version < '7.0'
34+
add_net_gems_dependency if version.split(' ').last < '7.0'
3835

3936
gem "rails", version
40-
41-
if rails_version < '6.0' && RUBY_VERSION < '2.3'
42-
gem "activesupport", "~> 5.2", "!= 5.2.6.1", "!= 5.2.6.2"
43-
end
44-
45-
gem "sprockets", '~> 3.0' if RUBY_VERSION < '2.5'
4637
gem "puma"
4738
gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
4839
gem 'selenium-webdriver', require: false

‎README.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ detailed explanations of how the application is supposed to behave,
99
expressed in plain English.
1010

1111
According to [RSpec Rails new versioning strategy][] use:
12-
* **[`rspec-rails` 5.x][]** for Rails 6.x.
12+
* **[`rspec-rails` 6.x][]** for Rails 6.1 or 7.x.
13+
* **[`rspec-rails` 5.x][]** for Rails 5.2 or 6.x.
1314
* **[`rspec-rails` 4.x][]** for Rails from 5.x or 6.x.
1415
* **[`rspec-rails` 3.x][]** for Rails earlier than 5.0.
1516
* **[`rspec-rails` 1.x][]** for Rails 2.x.
@@ -25,21 +26,22 @@ According to [RSpec Rails new versioning strategy][] use:
2526
[`rspec-rails` 1.x]: https://github.com/dchelimsky/rspec-rails
2627
[`rspec-rails` 3.x]: https://github.com/rspec/rspec-rails/tree/3-9-maintenance
2728
[`rspec-rails` 4.x]: https://github.com/rspec/rspec-rails/tree/4-1-maintenance
28-
[`rspec-rails` 5.x]: https://github.com/rspec/rspec-rails/tree/5-0-maintenance
29+
[`rspec-rails` 5.x]: https://github.com/rspec/rspec-rails/tree/5-1-maintenance
30+
[`rspec-rails` 6.x]: https://github.com/rspec/rspec-rails/tree/6-0-maintenance
2931
[RSpec Rails new versioning strategy]: https://github.com/rspec/rspec-rails/blob/main/rfcs/versioning-strategy.md
3032

3133
## Installation
3234

3335
**IMPORTANT** This README / branch refers to the current development build.
34-
See the [`5-0-maintenance` branch on Github](https://github.com/rspec/rspec-rails/tree/5-0-maintenance) if you want or require the latest stable release.
36+
See the [`6-0-maintenance` branch on Github](https://github.com/rspec/rspec-rails/tree/6-0-maintenance) if you want or require the latest stable release.
3537

3638
1. Add `rspec-rails` to **both** the `:development` and `:test` groups
3739
of your app’s `Gemfile`:
3840

3941
```ruby
4042
# Run against this stable release
4143
group :development, :test do
42-
gem 'rspec-rails', '~> 5.0.0'
44+
gem 'rspec-rails', '~> 6.0.0'
4345
end
4446

4547
# Or, run against the main branch

‎rspec-rails.gemspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
1111
s.homepage = "https://github.com/rspec/rspec-rails"
1212
s.summary = "RSpec for Rails"
1313
s.description = "rspec-rails is a testing framework for Rails 5+."
14-
s.required_ruby_version = ">= 2.2.0"
14+
s.required_ruby_version = ">= 2.5.0"
1515

1616
s.metadata = {
1717
'bug_tracker_uri' => 'https://github.com/rspec/rspec-rails/issues',
@@ -33,7 +33,7 @@ Gem::Specification.new do |s|
3333
s.cert_chain = [File.expand_path('~/.gem/rspec-gem-public_cert.pem')]
3434
end
3535

36-
version_string = ['>= 5.2']
36+
version_string = ['>= 6.1']
3737

3838
s.add_runtime_dependency 'actionpack', version_string
3939
s.add_runtime_dependency 'activesupport', version_string

0 commit comments

Comments
 (0)