From 76fdfe43040bc00a3a128f931765636afa2ffe1f Mon Sep 17 00:00:00 2001 From: Matt Date: Wed, 7 Jan 2026 16:34:14 +0100 Subject: [PATCH 1/3] feat: add ruby 4.0.0 support --- packages/forest_admin_agent/forest_admin_agent.gemspec | 3 +++ .../forest_admin_datasource_customizer.gemspec | 3 +++ .../forest_admin_datasource_rpc.gemspec | 3 +++ .../forest_admin_datasource_toolkit.gemspec | 8 ++++++++ packages/forest_admin_rails/forest_admin_rails.gemspec | 3 +++ .../forest_admin_rpc_agent/forest_admin_rpc_agent.gemspec | 3 +++ 6 files changed, 23 insertions(+) diff --git a/packages/forest_admin_agent/forest_admin_agent.gemspec b/packages/forest_admin_agent/forest_admin_agent.gemspec index b81b672a5..ff3821e35 100644 --- a/packages/forest_admin_agent/forest_admin_agent.gemspec +++ b/packages/forest_admin_agent/forest_admin_agent.gemspec @@ -35,9 +35,12 @@ admin work on any Ruby application." spec.add_dependency "activesupport", ">= 6.1" spec.add_dependency "base64" + spec.add_dependency "benchmark" spec.add_dependency "bigdecimal" + spec.add_dependency "cgi" spec.add_dependency "csv" spec.add_dependency "deepsort", "~> 0.4.5" + spec.add_dependency "logger" spec.add_dependency "mutex_m" spec.add_dependency "ostruct" spec.add_dependency "dry-container", "~> 0.11" diff --git a/packages/forest_admin_datasource_customizer/forest_admin_datasource_customizer.gemspec b/packages/forest_admin_datasource_customizer/forest_admin_datasource_customizer.gemspec index 056f7e9c7..c858554b1 100644 --- a/packages/forest_admin_datasource_customizer/forest_admin_datasource_customizer.gemspec +++ b/packages/forest_admin_datasource_customizer/forest_admin_datasource_customizer.gemspec @@ -35,8 +35,11 @@ admin work on any Ruby application." spec.add_dependency "activesupport", ">= 6.1" spec.add_dependency "base64" + spec.add_dependency "benchmark" spec.add_dependency "bigdecimal" + spec.add_dependency "cgi" spec.add_dependency "csv" + spec.add_dependency "logger" spec.add_dependency 'marcel', '~> 1.0', '>= 1.0.4' spec.add_dependency "mutex_m" spec.add_dependency "ostruct" diff --git a/packages/forest_admin_datasource_rpc/forest_admin_datasource_rpc.gemspec b/packages/forest_admin_datasource_rpc/forest_admin_datasource_rpc.gemspec index b7a2626ce..218ef41a6 100644 --- a/packages/forest_admin_datasource_rpc/forest_admin_datasource_rpc.gemspec +++ b/packages/forest_admin_datasource_rpc/forest_admin_datasource_rpc.gemspec @@ -33,9 +33,12 @@ admin work on any Ruby application." spec.require_paths = ["lib"] spec.add_dependency "base64" + spec.add_dependency "benchmark" spec.add_dependency "bigdecimal" + spec.add_dependency "cgi" spec.add_dependency "csv" spec.add_dependency "faraday", "~> 2.7" + spec.add_dependency "logger" spec.add_dependency "mutex_m" spec.add_dependency "ostruct" spec.add_dependency "zeitwerk", "~> 2.3" diff --git a/packages/forest_admin_datasource_toolkit/forest_admin_datasource_toolkit.gemspec b/packages/forest_admin_datasource_toolkit/forest_admin_datasource_toolkit.gemspec index b8c9faf59..7a720d5d5 100644 --- a/packages/forest_admin_datasource_toolkit/forest_admin_datasource_toolkit.gemspec +++ b/packages/forest_admin_datasource_toolkit/forest_admin_datasource_toolkit.gemspec @@ -33,5 +33,13 @@ admin work on any Ruby application." spec.require_paths = ["lib"] spec.add_dependency "activesupport", ">= 6.1" + spec.add_dependency "base64" + spec.add_dependency "benchmark" + spec.add_dependency "bigdecimal" + spec.add_dependency "cgi" + spec.add_dependency "csv" + spec.add_dependency "logger" + spec.add_dependency "mutex_m" + spec.add_dependency "ostruct" spec.add_dependency "zeitwerk", "~> 2.3" end diff --git a/packages/forest_admin_rails/forest_admin_rails.gemspec b/packages/forest_admin_rails/forest_admin_rails.gemspec index fe7031718..a9b9a92ed 100644 --- a/packages/forest_admin_rails/forest_admin_rails.gemspec +++ b/packages/forest_admin_rails/forest_admin_rails.gemspec @@ -22,9 +22,12 @@ admin work on any Rails application (Rails >= 6.1)." end spec.add_dependency "base64" + spec.add_dependency "benchmark" spec.add_dependency "bigdecimal" + spec.add_dependency "cgi" spec.add_dependency "csv" spec.add_dependency "dry-configurable", "~> 1.1" + spec.add_dependency "logger" spec.add_dependency "mutex_m" spec.add_dependency "ostruct" spec.add_dependency "rails", ">= 6.1" diff --git a/packages/forest_admin_rpc_agent/forest_admin_rpc_agent.gemspec b/packages/forest_admin_rpc_agent/forest_admin_rpc_agent.gemspec index 6dd73c5d0..34671010e 100644 --- a/packages/forest_admin_rpc_agent/forest_admin_rpc_agent.gemspec +++ b/packages/forest_admin_rpc_agent/forest_admin_rpc_agent.gemspec @@ -31,9 +31,12 @@ admin work on any Ruby application." spec.require_paths = ["lib"] spec.add_dependency "base64" + spec.add_dependency "benchmark" spec.add_dependency "bigdecimal" + spec.add_dependency "cgi" spec.add_dependency "csv" spec.add_dependency "dry-configurable", "~> 1.1" + spec.add_dependency "logger" spec.add_dependency "mutex_m" spec.add_dependency "ostruct" spec.add_dependency "thor", "~> 1.3" From ebd24b736c990ea9fe2b347a9cb6f74a249b0ca2 Mon Sep 17 00:00:00 2001 From: Matt Date: Wed, 7 Jan 2026 16:34:38 +0100 Subject: [PATCH 2/3] chore(ci): set ruby 4.0 --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a1cd76ad6..739809f7a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - ruby-version: ["3.3", "3.4"] + ruby-version: ["3.4", "4.0"] packages: - forest_admin_agent - forest_admin_datasource_active_record @@ -55,7 +55,7 @@ jobs: needs: [lint] strategy: matrix: - ruby-version: ["3.3", "3.4"] + ruby-version: ["3.4", "4.0"] packages: - forest_admin_agent - forest_admin_datasource_active_record @@ -101,7 +101,7 @@ jobs: cd - - name: Upload coverage - if: ${{ matrix.ruby-version == '3.4' }} + if: ${{ matrix.ruby-version == '4.0' }} uses: actions/upload-artifact@v4 with: name: ${{ matrix.ruby-version }}-${{ matrix.packages }} From 2f770ffc7391a722bbd369a7f09aeff81f2ba61d Mon Sep 17 00:00:00 2001 From: Matt Date: Thu, 8 Jan 2026 11:16:00 +0100 Subject: [PATCH 3/3] fix: update deps into mongoid & active-record --- .../forest_admin_datasource_active_record.gemspec | 8 ++++++++ .../forest_admin_datasource_mongoid.gemspec | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/packages/forest_admin_datasource_active_record/forest_admin_datasource_active_record.gemspec b/packages/forest_admin_datasource_active_record/forest_admin_datasource_active_record.gemspec index 7bf9c1c30..52dc4e6e0 100644 --- a/packages/forest_admin_datasource_active_record/forest_admin_datasource_active_record.gemspec +++ b/packages/forest_admin_datasource_active_record/forest_admin_datasource_active_record.gemspec @@ -34,5 +34,13 @@ admin work on any Ruby application." spec.add_dependency "activerecord", ">= 6.1" spec.add_dependency "activesupport", ">= 6.1" + spec.add_dependency "base64" + spec.add_dependency "benchmark" + spec.add_dependency "bigdecimal" + spec.add_dependency "cgi" + spec.add_dependency "csv" + spec.add_dependency "logger" + spec.add_dependency "mutex_m" + spec.add_dependency "ostruct" spec.add_dependency "zeitwerk", "~> 2.3" end diff --git a/packages/forest_admin_datasource_mongoid/forest_admin_datasource_mongoid.gemspec b/packages/forest_admin_datasource_mongoid/forest_admin_datasource_mongoid.gemspec index 7b7c59eb1..7665d996a 100644 --- a/packages/forest_admin_datasource_mongoid/forest_admin_datasource_mongoid.gemspec +++ b/packages/forest_admin_datasource_mongoid/forest_admin_datasource_mongoid.gemspec @@ -34,5 +34,13 @@ admin work on any Ruby application." spec.add_dependency "mongoid", ">= 9.0" spec.add_dependency "activesupport", ">= 6.1" + spec.add_dependency "base64" + spec.add_dependency "benchmark" + spec.add_dependency "bigdecimal" + spec.add_dependency "cgi" + spec.add_dependency "csv" + spec.add_dependency "logger" + spec.add_dependency "mutex_m" + spec.add_dependency "ostruct" spec.add_dependency "zeitwerk", "~> 2.3" end