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.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade Ruby to version 3.3.6 #78

Merged
merged 2 commits into from
Dec 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.1.5
3.3.6
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# Unreleased

* Drop support for Ruby 3.1, keep supporting Ruby 3.2, use Ruby 3.3 as default https://github.com/alphagov/rails_translation_manager/pull/78
Copy link
Contributor

Choose a reason for hiding this comment

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

I think it would be better to have these changes in a separate commit.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed


# 1.7.0

* Drop support for Ruby 3.0
Expand Down
2 changes: 1 addition & 1 deletion rails_translation_manager.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I've increased the required ruby version for the apps using this gem to 3.2. I didn't make it 3.3, because some apps do not use 3.3 yet.

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)/})
Expand Down
2 changes: 1 addition & 1 deletion test/rails_translation_manager/exporter_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/rails_translation_manager/yaml_writer_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading