diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index 3e33190e..d1486942 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -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 @@ -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: diff --git a/README.md b/README.md index 1d174ddc..7b7a6bca 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/gemfiles/Gemfile.rails-5.0.x b/gemfiles/Gemfile.rails-5.0.x deleted file mode 100644 index 5428e594..00000000 --- a/gemfiles/Gemfile.rails-5.0.x +++ /dev/null @@ -1,13 +0,0 @@ -source 'https://rubygems.org' - -gemspec :path => '..' - -gem 'activesupport', '~> 5.0.0' -gem 'mocha', '~> 2.1.0' -gem 'test_declarative', '0.0.6' -gem 'rake', '~> 13' -gem 'minitest', '~> 5.14' - -platforms :mri do - gem 'oj' -end diff --git a/gemfiles/Gemfile.rails-5.2.x b/gemfiles/Gemfile.rails-5.2.x deleted file mode 100644 index 854d4fe7..00000000 --- a/gemfiles/Gemfile.rails-5.2.x +++ /dev/null @@ -1,13 +0,0 @@ -source 'https://rubygems.org' - -gemspec :path => '..' - -gem 'activesupport', '~> 5.2.0' -gem 'mocha', '~> 2.1.0' -gem 'test_declarative', '0.0.6' -gem 'rake' -gem 'minitest', '~> 5.14' - -platforms :mri do - gem 'oj' -end diff --git a/gemfiles/Gemfile.rails-5.1.x b/gemfiles/Gemfile.rails-7.1.x similarity index 73% rename from gemfiles/Gemfile.rails-5.1.x rename to gemfiles/Gemfile.rails-7.1.x index a944b7a2..f427a474 100644 --- a/gemfiles/Gemfile.rails-5.1.x +++ b/gemfiles/Gemfile.rails-7.1.x @@ -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' diff --git a/i18n.gemspec b/i18n.gemspec index 2bfad5be..4d94dbbc 100644 --- a/i18n.gemspec +++ b/i18n.gemspec @@ -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