Skip to content

Commit eaacc0b

Browse files
authored
Loosen activerecord restriction to work with rails 7 (ctran#912)
1 parent ecf70d8 commit eaacc0b

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

annotate.gemspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
2323

2424
s.specification_version = 4 if s.respond_to? :specification_version
2525
s.add_runtime_dependency(%q<rake>, '>= 10.4', '< 14.0')
26-
s.add_runtime_dependency(%q<activerecord>, ['>= 3.2', '< 7.0'])
26+
s.add_runtime_dependency(%q<activerecord>, ['>= 3.2', '< 8.0'])
2727

2828
s.metadata = {
2929
"bug_tracker_uri" => "https://github.com/ctran/annotate_models/issues/",

spec/integration/rails_5.2.4.1/Gemfile.lock

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ PATH
22
remote: ../../..
33
specs:
44
annotate (3.1.1)
5-
activerecord (>= 3.2, < 7.0)
5+
activerecord (>= 3.2, < 8.0)
66
rake (>= 10.4, < 14.0)
77

88
GEM

spec/integration/rails_6.0.2.1/Gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ gem 'rails', '~> 6.0.2', '>= 6.0.2.1'
66
# Use sqlite3 as the database for Active Record
77
gem 'sqlite3', '~> 1.4'
88
# Use Puma as the app server
9-
gem 'puma', '~> 4.3'
9+
gem 'puma', '~> 5.6.1'
1010
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
1111
gem 'jbuilder', '~> 2.7'
1212
# Use Redis adapter to run Action Cable in production

spec/integration/rails_6.0.2.1/Gemfile.lock

+5-5
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ PATH
22
remote: ../../..
33
specs:
44
annotate (3.1.1)
5-
activerecord (>= 3.2, < 7.0)
5+
activerecord (>= 3.2, < 8.0)
66
rake (>= 10.4, < 14.0)
77

88
GEM
@@ -82,7 +82,7 @@ GEM
8282
concurrent-ruby (1.1.8)
8383
crass (1.0.6)
8484
erubi (1.10.0)
85-
ffi (1.12.2)
85+
ffi (1.15.5)
8686
globalid (0.4.2)
8787
activesupport (>= 4.2.0)
8888
i18n (1.8.10)
@@ -113,7 +113,7 @@ GEM
113113
mini_portile2 (~> 2.5.0)
114114
racc (~> 1.4)
115115
public_suffix (4.0.3)
116-
puma (4.3.5)
116+
puma (5.6.1)
117117
nio4r (~> 2.0)
118118
racc (1.5.2)
119119
rack (2.2.3)
@@ -146,7 +146,7 @@ GEM
146146
rake (>= 0.8.7)
147147
thor (>= 0.20.3, < 2.0)
148148
rake (13.0.3)
149-
rb-fsevent (0.10.3)
149+
rb-fsevent (0.11.0)
150150
rb-inotify (0.10.1)
151151
ffi (~> 1.0)
152152
regexp_parser (1.6.0)
@@ -193,7 +193,7 @@ DEPENDENCIES
193193
capybara (>= 2.15)
194194
jbuilder (~> 2.7)
195195
listen (>= 3.0.5, < 3.2)
196-
puma (~> 4.3)
196+
puma (~> 5.6.1)
197197
rails (~> 6.0.2, >= 6.0.2.1)
198198
selenium-webdriver
199199
sqlite3 (~> 1.4)

0 commit comments

Comments
 (0)