Skip to content

Commit ba2ee99

Browse files
author
Jolyon Pawlyn
committed
Relax gem requirement to allow Rails 7
1 parent 669b0a3 commit ba2ee99

File tree

2 files changed

+13
-1
lines changed

2 files changed

+13
-1
lines changed

.travis.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ _rails_supported_versions:
3232
- &rails_5_2_jruby RAILS_VERSION=5.2 JRUBY_OPTS='--dev -J-Xmx1024M --debug'
3333
- &rails_6_0 RAILS_VERSION=6.0
3434
- &rails_6_0_jruby RAILS_VERSION=6.0 JRUBY_OPTS='--dev -J-Xmx1024M --debug'
35+
- &rails_7_0 RAILS_VERSION=7.0
36+
- &rails_7_0_jruby RAILS_VERSION=7.0 JRUBY_OPTS='--dev -J-Xmx1024M --debug'
3537
- &rails_master RAILS_VERSION=master
3638
- &rails_master_jruby RAILS_VERSION=master JRUBY_OPTS='--dev -J-Xmx1024M --debug'
3739

@@ -59,6 +61,7 @@ env:
5961
- *rails_5_1
6062
- *rails_5_2
6163
- *rails_6_0
64+
- *rails_7_0
6265
- *rails_master
6366

6467
rvm:
@@ -87,13 +90,15 @@ jobs:
8790
- { rvm: *jruby_9_2, jdk: *jdk_8, env: *rails_5_1_jruby }
8891
- { rvm: *jruby_9_2, jdk: *jdk_8, env: *rails_5_2_jruby }
8992
- { rvm: *jruby_9_2, jdk: *jdk_8, env: *rails_6_0_jruby }
93+
- { rvm: *jruby_9_2, jdk: *jdk_8, env: *rails_7_0_jruby }
9094
- { rvm: *jruby_9_2, jdk: *jdk_8, env: *rails_master_jruby }
9195

9296
- { rvm: *jruby_head, jdk: *jdk_8, env: *rails_4_2_jruby }
9397
- { rvm: *jruby_head, jdk: *jdk_8, env: *rails_5_0_jruby }
9498
- { rvm: *jruby_head, jdk: *jdk_8, env: *rails_5_1_jruby }
9599
- { rvm: *jruby_head, jdk: *jdk_8, env: *rails_5_2_jruby }
96100
- { rvm: *jruby_head, jdk: *jdk_8, env: *rails_6_0_jruby }
101+
- { rvm: *jruby_head, jdk: *jdk_8, env: *rails_7_0_jruby }
97102
- { rvm: *jruby_head, jdk: *jdk_8, env: *rails_master_jruby }
98103

99104
exclude:
@@ -107,6 +112,13 @@ jobs:
107112
- { rvm: *ruby_2_2, env: *rails_6_0 }
108113
- { rvm: *ruby_2_3, env: *rails_6_0 }
109114

115+
- { rvm: *ruby_2_1, env: *rails_7_0 }
116+
- { rvm: *ruby_2_2, env: *rails_7_0 }
117+
- { rvm: *ruby_2_3, env: *rails_7_0 }
118+
- { rvm: *ruby_2_4, env: *rails_7_0 }
119+
- { rvm: *ruby_2_5, env: *rails_7_0 }
120+
- { rvm: *ruby_2_6, env: *rails_7_0 }
121+
110122
- { rvm: *ruby_2_1, env: *rails_master }
111123
- { rvm: *ruby_2_2, env: *rails_master }
112124
- { rvm: *ruby_2_3, env: *rails_master }

active_model_serializers.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
2121

2222
spec.required_ruby_version = '>= 2.1'
2323

24-
rails_versions = ['>= 4.1', '< 7.0']
24+
rails_versions = ['>= 4.1', '< 8.0']
2525
spec.add_runtime_dependency 'activemodel', rails_versions
2626
# 'activesupport', rails_versions
2727
# 'builder'

0 commit comments

Comments
 (0)