Skip to content

Commit

Permalink
Relax gem requirement to allow Rails 7
Browse files Browse the repository at this point in the history
  • Loading branch information
Jolyon Pawlyn committed Dec 16, 2021
1 parent 669b0a3 commit ba2ee99
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 1 deletion.
12 changes: 12 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ _rails_supported_versions:
- &rails_5_2_jruby RAILS_VERSION=5.2 JRUBY_OPTS='--dev -J-Xmx1024M --debug'
- &rails_6_0 RAILS_VERSION=6.0
- &rails_6_0_jruby RAILS_VERSION=6.0 JRUBY_OPTS='--dev -J-Xmx1024M --debug'
- &rails_7_0 RAILS_VERSION=7.0
- &rails_7_0_jruby RAILS_VERSION=7.0 JRUBY_OPTS='--dev -J-Xmx1024M --debug'
- &rails_master RAILS_VERSION=master
- &rails_master_jruby RAILS_VERSION=master JRUBY_OPTS='--dev -J-Xmx1024M --debug'

Expand Down Expand Up @@ -59,6 +61,7 @@ env:
- *rails_5_1
- *rails_5_2
- *rails_6_0
- *rails_7_0
- *rails_master

rvm:
Expand Down Expand Up @@ -87,13 +90,15 @@ jobs:
- { rvm: *jruby_9_2, jdk: *jdk_8, env: *rails_5_1_jruby }
- { rvm: *jruby_9_2, jdk: *jdk_8, env: *rails_5_2_jruby }
- { rvm: *jruby_9_2, jdk: *jdk_8, env: *rails_6_0_jruby }
- { rvm: *jruby_9_2, jdk: *jdk_8, env: *rails_7_0_jruby }
- { rvm: *jruby_9_2, jdk: *jdk_8, env: *rails_master_jruby }

- { rvm: *jruby_head, jdk: *jdk_8, env: *rails_4_2_jruby }
- { rvm: *jruby_head, jdk: *jdk_8, env: *rails_5_0_jruby }
- { rvm: *jruby_head, jdk: *jdk_8, env: *rails_5_1_jruby }
- { rvm: *jruby_head, jdk: *jdk_8, env: *rails_5_2_jruby }
- { rvm: *jruby_head, jdk: *jdk_8, env: *rails_6_0_jruby }
- { rvm: *jruby_head, jdk: *jdk_8, env: *rails_7_0_jruby }
- { rvm: *jruby_head, jdk: *jdk_8, env: *rails_master_jruby }

exclude:
Expand All @@ -107,6 +112,13 @@ jobs:
- { rvm: *ruby_2_2, env: *rails_6_0 }
- { rvm: *ruby_2_3, env: *rails_6_0 }

- { rvm: *ruby_2_1, env: *rails_7_0 }
- { rvm: *ruby_2_2, env: *rails_7_0 }
- { rvm: *ruby_2_3, env: *rails_7_0 }
- { rvm: *ruby_2_4, env: *rails_7_0 }
- { rvm: *ruby_2_5, env: *rails_7_0 }
- { rvm: *ruby_2_6, env: *rails_7_0 }

- { rvm: *ruby_2_1, env: *rails_master }
- { rvm: *ruby_2_2, env: *rails_master }
- { rvm: *ruby_2_3, env: *rails_master }
Expand Down
2 changes: 1 addition & 1 deletion active_model_serializers.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Gem::Specification.new do |spec|

spec.required_ruby_version = '>= 2.1'

rails_versions = ['>= 4.1', '< 7.0']
rails_versions = ['>= 4.1', '< 8.0']
spec.add_runtime_dependency 'activemodel', rails_versions
# 'activesupport', rails_versions
# 'builder'
Expand Down

0 comments on commit ba2ee99

Please sign in to comment.