Skip to content

Commit

Permalink
Merge branch 'master' into add-inspect-to-fallbacks
Browse files Browse the repository at this point in the history
* master:
  Clearly specify which versions of Ruby + Rails we support
  Add back Ruby 3.0 support
  Use actions/checkout@v4, as Node 16 actions have been deprecated
  Bump Mocha deps to v2 to fix build issue
  Specify racc as a dependency
  Update workflows
  • Loading branch information
radar committed Mar 5, 2024
2 parents aca633e + 284ae1b commit 9e86475
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 55 deletions.
30 changes: 3 additions & 27 deletions .github/workflows/ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,39 +17,15 @@ jobs:
strategy:
fail-fast: false
matrix:
ruby_version: [3.2, 3.1, "3.0", 2.7, 2.6, jruby]
ruby_version: [3.3, 3.2, 3.1, 3.0, jruby]
gemfile:
- Gemfile
- gemfiles/Gemfile.rails-5.2.x
- gemfiles/Gemfile.rails-6.0.x
- gemfiles/Gemfile.rails-6.1.x
- gemfiles/Gemfile.rails-7.0.x
- gemfiles/Gemfile.rails-7.1.x
- gemfiles/Gemfile.rails-main
exclude:
# Ruby 3.2 is not supported by Rails 5.2.x
- ruby_version: 3.2
gemfile: gemfiles/Gemfile.rails-5.2.x

# Ruby 3.1 is not supported by Rails 5.2.x
- ruby_version: 3.1
gemfile: gemfiles/Gemfile.rails-5.2.x

# Ruby 3.x is not supported by Rails 5.2.x
- ruby_version: "3.0"
gemfile: gemfiles/Gemfile.rails-5.2.x

# Ruby 2.6.x is not supported by Rails main
- ruby_version: 2.6
gemfile: gemfiles/Gemfile.rails-main

# Ruby 2.6.x is not supported by Rails 7.0.x
- ruby_version: 2.6
gemfile: gemfiles/Gemfile.rails-7.0.x

# JRuby 9.4.2.0 (3.1.0) is not supported by Rails 5.2.x
- ruby_version: jruby
gemfile: gemfiles/Gemfile.rails-5.2.x

# JRuby is not supported by Rails 7.0.x
- ruby_version: jruby
gemfile: gemfiles/Gemfile.rails-7.0.x
Expand All @@ -61,7 +37,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
Expand Down
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,14 @@ Currently maintained by @radar.

You will most commonly use this library within a Rails app.

We support Rails versions from 6.0 and up.

[See the Rails Guide](https://guides.rubyonrails.org/i18n.html) for an example of its usage.

### Ruby (without Rails)

We support Ruby versions from 3.0 and up.

If you want to use this library without Rails, you can simply add `i18n` to your `Gemfile`:

```ruby
Expand Down
13 changes: 0 additions & 13 deletions gemfiles/Gemfile.rails-5.0.x

This file was deleted.

13 changes: 0 additions & 13 deletions gemfiles/Gemfile.rails-5.2.x

This file was deleted.

4 changes: 2 additions & 2 deletions gemfiles/Gemfile.rails-5.1.x → gemfiles/Gemfile.rails-7.1.x
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ source 'https://rubygems.org'

gemspec :path => '..'

gem 'activesupport', '~> 5.1.0'
gem 'mocha', '~> 2.1.0'
gem 'activesupport', '~> 7.1'
gem 'mocha', '~> 2'
gem 'test_declarative', '0.0.6'
gem 'rake'
gem 'minitest', '~> 5.14'
Expand Down
1 change: 1 addition & 0 deletions i18n.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,6 @@ Gem::Specification.new do |s|
s.required_ruby_version = '>= 2.3.0'

s.add_dependency 'concurrent-ruby', '~> 1.0'
s.add_dependency 'racc', '~> 1.7'

end

0 comments on commit 9e86475

Please sign in to comment.