From 816e5b6434811fc766a0da2219b78b28598708aa Mon Sep 17 00:00:00 2001 From: Juan Vasquez Date: Tue, 4 Feb 2025 13:38:38 -0600 Subject: [PATCH 1/2] Add Ruby 3.4 support Ruby 3.4 is removing the `base64` default gem to [became bundled](https://rubyreferences.github.io/rubychanges/3.4.html#default-gems-that-became-bundled) Making the current webmock (v3.16.2) gem incompatible because it has a dependency on the `base64` gem, to fix it we are bumping webmock to v3.20.0 which [removed the `base64`](https://github.com/bblimke/webmock/pull/1046) dependency. > [!NOTE] > As an alternative solution, we can leave the current `webmock` version untoched and add the `base64` gem as a dependency. --- .github/workflows/main.yml | 2 +- CHANGELOG.md | 2 ++ next_rails.gemspec | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9cf0d16..caf6872 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - ruby-version: ["3.3", "3.2", "3.1", "3.0", "2.7", "2.6"] + ruby-version: ["3.4", "3.3", "3.2", "3.1", "3.0", "2.7", "2.6"] steps: - uses: actions/checkout@v2 diff --git a/CHANGELOG.md b/CHANGELOG.md index 84b58ff..a3b3708 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # main [(unreleased)](https://github.com/fastruby/next_rails/compare/v1.4.2...main) +- [Add Ruby 3.4 support](https://github.com/fastruby/next_rails/pull/133) + * Your changes/patches go here. # v1.4.2 / 2024-10-25 [(commits)](https://github.com/fastruby/next_rails/compare/v1.4.1...v1.4.2) diff --git a/next_rails.gemspec b/next_rails.gemspec index 197957b..7d6713f 100644 --- a/next_rails.gemspec +++ b/next_rails.gemspec @@ -13,7 +13,7 @@ Gem::Specification.new do |spec| spec.homepage = "https://github.com/fastruby/next_rails" spec.license = "MIT" - spec.required_ruby_version = ">= 2.0" + spec.required_ruby_version = ">= 2.0", "< 3.5" spec.files = `git ls-files -z`.split("\x0").reject do |f| f.match(%r{^(test|spec|features)/}) @@ -30,5 +30,5 @@ Gem::Specification.new do |spec| spec.add_development_dependency "timecop", "~> 0.9.1" spec.add_development_dependency "byebug" spec.add_development_dependency "rexml", "3.3.8" # limited on purpose, new versions don't work with old rubies - spec.add_development_dependency "webmock", "3.16.2" # limited on purpose, new versions don't work with old rubies + spec.add_development_dependency "webmock", "3.20.0" end From 626f4ebd22488d546b91f0facfe1142bc468fed8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20V=C3=A1squez?= Date: Thu, 6 Feb 2025 22:37:18 -0600 Subject: [PATCH 2/2] Update next_rails.gemspec --- next_rails.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/next_rails.gemspec b/next_rails.gemspec index 7d6713f..dc59c4b 100644 --- a/next_rails.gemspec +++ b/next_rails.gemspec @@ -13,7 +13,7 @@ Gem::Specification.new do |spec| spec.homepage = "https://github.com/fastruby/next_rails" spec.license = "MIT" - spec.required_ruby_version = ">= 2.0", "< 3.5" + spec.required_ruby_version = ">= 2.0" spec.files = `git ls-files -z`.split("\x0").reject do |f| f.match(%r{^(test|spec|features)/})