Skip to content
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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make rails-i18n work with rails7 #957

Closed
wants to merge 1 commit into from
Closed

Make rails-i18n work with rails7 #957

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
121 changes: 60 additions & 61 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,44 +1,43 @@
PATH
remote: .
specs:
rails-i18n (6.0.0)
rails-i18n (7.0.0)
i18n (>= 0.7, < 2)
railties (>= 6.0.0, < 7)
railties (>= 7.0.0, < 8)

GEM
remote: https://rubygems.org/
specs:
actionpack (6.0.0)
actionview (= 6.0.0)
activesupport (= 6.0.0)
rack (~> 2.0)
actionpack (7.0.0)
actionview (= 7.0.0)
activesupport (= 7.0.0)
rack (~> 2.0, >= 2.2.0)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actionview (6.0.0)
activesupport (= 6.0.0)
actionview (7.0.0)
activesupport (= 7.0.0)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
activesupport (6.0.0)
activesupport (7.0.0)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
zeitwerk (~> 2.1, >= 2.1.8)
ast (2.4.0)
builder (3.2.3)
concurrent-ruby (1.1.5)
crass (1.0.4)
diff-lcs (1.3)
erubi (1.8.0)
highline (2.0.2)
i18n (1.6.0)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
ast (2.4.2)
builder (3.2.4)
concurrent-ruby (1.1.9)
crass (1.0.6)
diff-lcs (1.4.4)
erubi (1.10.0)
highline (2.0.3)
i18n (1.8.11)
concurrent-ruby (~> 1.0)
i18n-spec (0.6.0)
iso
i18n-tasks (0.9.29)
i18n-tasks (0.9.35)
activesupport (>= 4.0.2)
ast (>= 2.1.0)
erubi
Expand All @@ -48,59 +47,59 @@ GEM
rails-i18n
rainbow (>= 2.2.2, < 4.0)
terminal-table (>= 1.5.1)
iso (0.2.2)
iso (0.4.0)
i18n
loofah (2.2.3)
loofah (2.13.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
method_source (0.9.2)
mini_portile2 (2.4.0)
minitest (5.11.3)
nokogiri (1.10.4)
mini_portile2 (~> 2.4.0)
parser (2.6.3.0)
ast (~> 2.4.0)
rack (2.0.7)
method_source (1.0.0)
minitest (5.15.0)
nokogiri (1.12.5-x86_64-linux)
racc (~> 1.4)
parser (3.0.3.2)
ast (~> 2.4.1)
racc (1.6.0)
rack (2.2.3)
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.2.0)
loofah (~> 2.2, >= 2.2.2)
railties (6.0.0)
actionpack (= 6.0.0)
activesupport (= 6.0.0)
rails-html-sanitizer (1.4.2)
loofah (~> 2.3)
railties (7.0.0)
actionpack (= 7.0.0)
activesupport (= 7.0.0)
method_source
rake (>= 0.8.7)
thor (>= 0.20.3, < 2.0)
rake (>= 12.2)
thor (~> 1.0)
zeitwerk (~> 2.5)
rainbow (3.0.0)
rake (12.3.3)
rspec-core (3.8.2)
rspec-support (~> 3.8.0)
rspec-expectations (3.8.4)
rake (13.0.6)
rspec-core (3.9.3)
rspec-support (~> 3.9.3)
rspec-expectations (3.9.4)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.8.0)
rspec-mocks (3.8.1)
rspec-support (~> 3.9.0)
rspec-mocks (3.9.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.8.0)
rspec-rails (3.8.2)
rspec-support (~> 3.9.0)
rspec-rails (3.9.1)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
rspec-core (~> 3.8.0)
rspec-expectations (~> 3.8.0)
rspec-mocks (~> 3.8.0)
rspec-support (~> 3.8.0)
rspec-support (3.8.2)
terminal-table (1.8.0)
unicode-display_width (~> 1.1, >= 1.1.1)
thor (0.20.3)
thread_safe (0.3.6)
tzinfo (1.2.5)
thread_safe (~> 0.1)
unicode-display_width (1.6.0)
zeitwerk (2.1.9)
rspec-core (~> 3.9.0)
rspec-expectations (~> 3.9.0)
rspec-mocks (~> 3.9.0)
rspec-support (~> 3.9.0)
rspec-support (3.9.4)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
thor (1.1.0)
tzinfo (2.0.4)
concurrent-ruby (~> 1.0)
unicode-display_width (2.1.0)
zeitwerk (2.5.1)

PLATFORMS
ruby
f6p marked this conversation as resolved.
Show resolved Hide resolved
Expand All @@ -112,4 +111,4 @@ DEPENDENCIES
rspec-rails (~> 3.7)

BUNDLED WITH
2.1.4
2.2.22
4 changes: 2 additions & 2 deletions rails-i18n.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Gem::Specification.new do |s|
s.name = "rails-i18n"
s.version = '6.0.0'
s.version = '7.0.0'
s.authors = ["Rails I18n Group"]
s.email = "rails-i18n@googlegroups.com"
s.homepage = "http://github.com/svenfuchs/rails-i18n"
Expand All @@ -16,7 +16,7 @@ Gem::Specification.new do |s|
s.required_rubygems_version = '>= 1.8.11'

s.add_runtime_dependency('i18n', '>= 0.7', '< 2')
s.add_runtime_dependency('railties', '>= 6.0.0', '< 7')
s.add_runtime_dependency('railties', '>= 7.0.0', '< 8')
Copy link

@uxxman uxxman Dec 16, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since everything still works with rails 6, I think we should only relax the upper limit and not restrict the lower one i.e.

s.add_runtime_dependency('railties', '>= 6.0.0', '< 8')

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agreed, supporting both Rails 6 and 7 will help with transitioning.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@f6p can you please do this small change?

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it should just be >= 6 so that it's compatible with future versions of rails in an "evergreen" setup

s.add_development_dependency "rspec-rails", "~> 3.7"
s.add_development_dependency "i18n-spec", "~> 0.6.0"
s.add_development_dependency 'i18n-tasks', '~> 0.9.20'
Expand Down