Skip to content
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

Jump to bottom

Be Rails 6.0.0.beta1 compatible #36

Merged
merged 5 commits into from
Jan 22, 2019
Merged

Be Rails 6.0.0.beta1 compatible #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0b90162
Add ActiveModel 6.0.0.beta1 gemfile
abinoam Jan 22, 2019
69c41ba
Add 6.0 gemfile to .travis.yml
abinoam Jan 22, 2019
68f9a3b
Update Ruby versions at travis
abinoam Jan 22, 2019
3ed1f03
Relax Rails version constraint to < 7.0
abinoam Jan 22, 2019
cd22724
Rails requires Ruby >= 2.5
abinoam Jan 22, 2019
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
13 changes: 10 additions & 3 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,24 @@ language: ruby
cache: bundler
sudo: false
rvm:
- 2.3.6
- 2.4.3
- 2.5.0
- 2.3
- 2.4
- 2.5
- 2.6
Copy link
Owner

Choose a reason for hiding this comment

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

👍

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This will (probably) ease the work at travis between patch versions of Ruby.

gemfile:
- Gemfile
- gemfiles/activemodel-3.2.gemfile
- gemfiles/activemodel-4.2.gemfile
- gemfiles/activemodel-5.1.gemfile
- gemfiles/activemodel-5.2.gemfile
- gemfiles/activemodel-6.0.gemfile
- gemfiles/activemodel-master.gemfile
matrix:
exclude:
- rvm: 2.3
gemfile: gemfiles/activemodel-6.0.gemfile
- rvm: 2.4
gemfile: gemfiles/activemodel-6.0.gemfile
allow_failures:
- gemfile: gemfiles/activemodel-master.gemfile
fast_finish: true
5 changes: 5 additions & 0 deletions gemfiles/activemodel-6.0.gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
source "https://rubygems.org"

gem "activemodel", ">= 6.0.0.beta1", "< 7.0"

gemspec path: "../"
2 changes: 1 addition & 1 deletion strip_attributes.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
spec.test_files = `git ls-files -- {test,spec}/*`.split("\n")
spec.require_paths = ["lib"]

spec.add_runtime_dependency "activemodel", ">= 3.0", "< 6.0"
spec.add_runtime_dependency "activemodel", ">= 3.0", "< 7.0"
spec.add_development_dependency "active_attr", "~> 0.10"
spec.add_development_dependency "minitest", ">= 5.0", "< 6.0"
spec.add_development_dependency "minitest-matchers_vaccine", "~> 1.0" unless ENV["SKIP_VACCINE"]
Expand Down