diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7c0df05..c88e6ff 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,11 +13,17 @@ jobs: gemfile: - Gemfile - gemfiles/Gemfile-rails-6-1 + - gemfiles/Gemfile-rails-7-2 ruby: - '3.0' - 3.1 - 3.2 - 3.3 + exclude: + - gemfile: Gemfile + ruby: '3.0' + - gemfile: Gemfile + ruby: 3.1 runs-on: ${{ matrix.os }} env: LOKALISE_API_TOKEN: 123abc diff --git a/CHANGELOG.md b/CHANGELOG.md index 5eb9a3c..2a4bab8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## Unreleased + +* Test with Rails 8 + ## 7.0.1 (10-May-2024) * Update documentation, minor code tweaks diff --git a/Gemfile b/Gemfile index 239321f..4831009 100644 --- a/Gemfile +++ b/Gemfile @@ -6,7 +6,7 @@ gemspec group :test do gem 'dotenv', '~> 3.0' - gem 'rails', '~> 7.1' + gem 'rails', '8.0.0.rc2' gem 'rake', '~> 13.0' gem 'rspec', '~> 3.6' gem 'rubocop', '~> 1.0' diff --git a/gemfiles/Gemfile-rails-7-2 b/gemfiles/Gemfile-rails-7-2 new file mode 100644 index 0000000..3492039 --- /dev/null +++ b/gemfiles/Gemfile-rails-7-2 @@ -0,0 +1,18 @@ +source "https://rubygems.org" + +gemspec path: ".." + +group :test do + gem 'tzinfo-data', platforms: %i[mingw mswin x64_mingw jruby] + gem 'dotenv', '~> 3.0' + gem 'rails', '~> 7.2' + gem 'rake', '~> 13.0' + gem 'rspec', '~> 3.6' + gem 'rubocop', '~> 1.0' + gem 'rubocop-performance', '~> 1.5' + gem 'rubocop-rspec', '~> 2.6' + gem 'rubocop-rake', '~> 0.6' + gem 'simplecov', '~> 0.22' + gem 'simplecov-lcov', '~> 0.8' + gem 'webmock', '~> 3.14' +end \ No newline at end of file diff --git a/spec/dummy/config/application.rb b/spec/dummy/config/application.rb index 7933391..5a7e6f7 100644 --- a/spec/dummy/config/application.rb +++ b/spec/dummy/config/application.rb @@ -34,8 +34,10 @@ class Application < Rails::Application if Rails.gem_version < Gem::Version.new('7.0') config.load_defaults 6.1 - else + elsif Rails.gem_version < Gem::Version.new('8.0') config.load_defaults 7.0 + else + config.load_defaults 8.0 end end end