Skip to content

Commit

Permalink
Merge pull request #36 from abinoam/update/rails_6_0_0_beta1
Browse files Browse the repository at this point in the history
Be Rails 6.0.0.beta1 compatible
  • Loading branch information
rmm5t authored Jan 22, 2019
2 parents f7b7497 + cd22724 commit 0d095d6
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 4 deletions.
13 changes: 10 additions & 3 deletions .travis.yml
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
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
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
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

0 comments on commit 0d095d6

Please sign in to comment.