Skip to content

Loosen activerecord restriction to work with rails 7 #912

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

Merged
merged 6 commits into from
Feb 3, 2022
Merged

Loosen activerecord restriction to work with rails 7 #912

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f38741d
Loosen activerecord restriction in order to be used with rails 7
Dec 16, 2021
aa767e1
Bonus: Add the rails routes rake task replica
Jan 24, 2022
5a81299
Loosen Rails version restriction to < 8.0
Feb 1, 2022
3e90229
Revert "Bonus: Add the rails routes rake task replica"
Feb 1, 2022
4582f87
Merge remote-tracking branch 'ctran/develop' into rails-7
Feb 2, 2022
b0d0041
Update Gemfiles for integration tests
Feb 3, 2022
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion annotate.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Gem::Specification.new do |s|

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

s.metadata = {
"bug_tracker_uri" => "https://github.com/ctran/annotate_models/issues/",
Expand Down
2 changes: 1 addition & 1 deletion spec/integration/rails_5.2.4.1/Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ PATH
remote: ../../..
specs:
annotate (3.1.1)
activerecord (>= 3.2, < 7.0)
activerecord (>= 3.2, < 8.0)
rake (>= 10.4, < 14.0)

GEM
Expand Down
2 changes: 1 addition & 1 deletion spec/integration/rails_6.0.2.1/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ gem 'rails', '~> 6.0.2', '>= 6.0.2.1'
# Use sqlite3 as the database for Active Record
gem 'sqlite3', '~> 1.4'
# Use Puma as the app server
gem 'puma', '~> 4.3'
gem 'puma', '~> 5.6.1'
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
gem 'jbuilder', '~> 2.7'
# Use Redis adapter to run Action Cable in production
Expand Down
10 changes: 5 additions & 5 deletions spec/integration/rails_6.0.2.1/Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ PATH
remote: ../../..
specs:
annotate (3.1.1)
activerecord (>= 3.2, < 7.0)
activerecord (>= 3.2, < 8.0)
rake (>= 10.4, < 14.0)

GEM
Expand Down Expand Up @@ -82,7 +82,7 @@ GEM
concurrent-ruby (1.1.8)
crass (1.0.6)
erubi (1.10.0)
ffi (1.12.2)
ffi (1.15.5)
globalid (0.4.2)
activesupport (>= 4.2.0)
i18n (1.8.10)
Expand Down Expand Up @@ -113,7 +113,7 @@ GEM
mini_portile2 (~> 2.5.0)
racc (~> 1.4)
public_suffix (4.0.3)
puma (4.3.5)
puma (5.6.1)
nio4r (~> 2.0)
racc (1.5.2)
rack (2.2.3)
Expand Down Expand Up @@ -146,7 +146,7 @@ GEM
rake (>= 0.8.7)
thor (>= 0.20.3, < 2.0)
rake (13.0.3)
rb-fsevent (0.10.3)
rb-fsevent (0.11.0)
rb-inotify (0.10.1)
ffi (~> 1.0)
regexp_parser (1.6.0)
Expand Down Expand Up @@ -193,7 +193,7 @@ DEPENDENCIES
capybara (>= 2.15)
jbuilder (~> 2.7)
listen (>= 3.0.5, < 3.2)
puma (~> 4.3)
puma (~> 5.6.1)
rails (~> 6.0.2, >= 6.0.2.1)
selenium-webdriver
sqlite3 (~> 1.4)
Expand Down