From dcb0505f1b34d4c110f201acbefe5d71876dadd5 Mon Sep 17 00:00:00 2001
From: Mateusz Grotek <mateusz.grotek@digital.cabinet-office.gov.uk>
Date: Wed, 11 Dec 2024 16:54:11 +0000
Subject: [PATCH] Upgrade Ruby to version 3.3.6

* Drop support for Ruby 3.1
---
 .github/workflows/ci.yml                           | 2 +-
 .ruby-version                                      | 2 +-
 CHANGELOG.md                                       | 6 ++++++
 rails_translation_manager.gemspec                  | 2 +-
 test/rails_translation_manager/exporter_test.rb    | 2 +-
 test/rails_translation_manager/yaml_writer_test.rb | 2 +-
 6 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b72ead3..d84e530 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [3.1, 3.2, 3.3]
+        ruby: [3.2, 3.3]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
diff --git a/.ruby-version b/.ruby-version
index 3ad0595..9c25013 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-3.1.5
+3.3.6
diff --git a/CHANGELOG.md b/CHANGELOG.md
index eb56a2f..5158d5f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# Unreleased
+
+* Drop support for Ruby 3.1
+* Keep supporting Ruby 3.2
+* Use Ruby 3.3 as default
+
 # 1.7.0
 
 * Drop support for Ruby 3.0
diff --git a/rails_translation_manager.gemspec b/rails_translation_manager.gemspec
index 9381a04..824edf7 100644
--- a/rails_translation_manager.gemspec
+++ b/rails_translation_manager.gemspec
@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = ""
   spec.license       = "MIT"
 
-  spec.required_ruby_version = ">= 3.1"
+  spec.required_ruby_version = ">= 3.2"
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
diff --git a/test/rails_translation_manager/exporter_test.rb b/test/rails_translation_manager/exporter_test.rb
index 2157c6d..3b20554 100644
--- a/test/rails_translation_manager/exporter_test.rb
+++ b/test/rails_translation_manager/exporter_test.rb
@@ -95,7 +95,7 @@ def setup
 
       data = read_csv_data(exported_file("fr.csv"))
       assert_equal ["French", nil], data["language_names.fr"]
-      assert_equal nil, data["language_names.es"], "language key for spanish should not be present"
+      assert_nil data["language_names.es"], "language key for spanish should not be present"
     end
 
     test 'should export correct pluralization forms for target' do
diff --git a/test/rails_translation_manager/yaml_writer_test.rb b/test/rails_translation_manager/yaml_writer_test.rb
index fa8e5d9..877d8f3 100644
--- a/test/rails_translation_manager/yaml_writer_test.rb
+++ b/test/rails_translation_manager/yaml_writer_test.rb
@@ -35,7 +35,7 @@ def teardown
 
       DummyWriter.new.write_yaml(output_file, data)
 
-      assert_match /\n$/, File.readlines(output_file).last
+      assert_match (/\n$/), File.readlines(output_file).last
     end
 
     test 'strips whitespace from the end of lines for consistency with code editors' do