Skip to content

Relax version requirement and test against Rails master (6.0.0.alpha) #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 4, 2018
Merged

Relax version requirement and test against Rails master (6.0.0.alpha) #42

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ed0d96a
Relax and test against Rails master (6.0.0.alpha)
sikachu Jun 2, 2018
e51c8ce
Update Ruby build matrix
sikachu Jun 2, 2018
5b15574
Remove upper limit altogether
sikachu Jun 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ gemfile:
- Gemfile
- gemfiles/Gemfile-rails-5-0
- gemfiles/Gemfile-rails-5-2
- gemfiles/Gemfile-rails-master
matrix:
allow_failures:
- rvm: ruby-head
Expand Down
4 changes: 4 additions & 0 deletions gemfiles/Gemfile-rails-master
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
source 'https://rubygems.org'
gemspec path: '..'

gem 'actionpack', git: "https://github.com/rails/rails.git"
8 changes: 4 additions & 4 deletions rails-controller-testing.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ Gem::Specification.new do |s|

s.required_ruby_version = '>= 2.2.2'

s.add_dependency "actionpack", "~> 5.x", ">= 5.0.1"
s.add_dependency "actionview", "~> 5.x", ">= 5.0.1"
s.add_dependency "activesupport", "~> 5.x"
s.add_dependency "actionpack", ">= 5.0.1", "< 6.1.x"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a reason we need "< 6.1.x"?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@composerinteralia I think being a bit conservative is good, since we don't know the future.

This will make the gem compatible up to 6.1.0.rc* but not 6.1.0 final. By the point that 6.1.0.alpha starts, I think we will already have another patch ready to bump it to, say, < 6.2.x, depends on how Rails core team decide on what's the next version should be.

s.add_dependency "actionview", ">= 5.0.1", "< 6.1.x"
s.add_dependency "activesupport", ">= 5.0.1", "< 6.1.x"

s.add_development_dependency "railties", "~> 5.x"
s.add_development_dependency "railties", "> 5.0.1", "< 6.1.x"

if defined?(JRUBY_VERSION)
s.add_development_dependency "jdbc-sqlite3"
Expand Down