From 020738edc4ed0153f4d35e2c527127012a5fa5c0 Mon Sep 17 00:00:00 2001 From: Tungle Duy Date: Sun, 23 Aug 2026 20:03:10 +0700 Subject: [PATCH 1/2] Upgrade to Rails 7.2 --- kanaui.gemspec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kanaui.gemspec b/kanaui.gemspec index 6813c42..cf35d54 100644 --- a/kanaui.gemspec +++ b/kanaui.gemspec @@ -26,6 +26,7 @@ Gem::Specification.new do |s| s.add_dependency 'js-routes', '>= 1.1', '< 3.0' s.add_dependency 'killbill-assets-ui' s.add_dependency 'killbill-client' - s.add_dependency 'rails', '~> 7.0' + s.required_ruby_version = '>= 3.1.0' + s.add_dependency 'rails', '~> 7.2' s.add_dependency 'spinjs-rails' end From 351aace8d853b17cd11e27ca358c85d5e0df9259 Mon Sep 17 00:00:00 2001 From: Tungle Duy Date: Sun, 23 Aug 2026 20:40:38 +0700 Subject: [PATCH 2/2] Fix JRuby CI: lock i18n to 1.14.x and bump JRuby to 9.4.15.0 --- .github/workflows/ci.yml | 4 ++-- Gemfile | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index af5ff18..5644e6e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,7 +25,7 @@ jobs: database-password: 'root' database-port: '3306' docker-compose-file: 'docker-compose.ci.mysql.yml' - - ruby-version: 'jruby-9.4.2.0' + - ruby-version: 'jruby-9.4.15.0' database-adapter: 'mysql2' database-user: 'root' database-password: 'root' @@ -37,7 +37,7 @@ jobs: database-password: 'postgres' database-port: '5432' docker-compose-file: 'docker-compose.ci.postgresql.yml' - - ruby-version: 'jruby-9.4.2.0' + - ruby-version: 'jruby-9.4.15.0' database-adapter: 'postgresql' database-user: 'postgres' database-password: 'postgres' diff --git a/Gemfile b/Gemfile index 4e096f7..d4178f8 100644 --- a/Gemfile +++ b/Gemfile @@ -12,6 +12,9 @@ gemspec # Git. Remember to move these dependencies to your gemspec before releasing # your gem to rubygems.org. +# Lock i18n to 1.14.x for: https://github.com/ruby-i18n/i18n/issues/735 +gem 'i18n', '~> 1.14.0' + # Lock minitest to 5.x until Rails 7.1+ adds Minitest 6.0 support # Minitest 6.0.0 was released Dec 2024 with breaking API changes gem 'minitest', '~> 5.0'