diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c3b92991e..8b778474d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -13,7 +13,7 @@ jobs: strategy: fail-fast: false matrix: - ruby: [3.2, 3.3] + ruby: [3.2, 3.3, 3.4] env: PGHOST: localhost PGUSER: administrate @@ -64,7 +64,7 @@ jobs: strategy: fail-fast: false matrix: - ruby: [3.1, 3.2, 3.3] + ruby: [3.1, 3.2, 3.3, 3.4] appraisal: [rails61, rails70, rails80, pundit21] include: - ruby: '3.0' diff --git a/.ruby-version b/.ruby-version index be94e6f53..47b322c97 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.2.2 +3.4.1 diff --git a/.tool-versions b/.tool-versions index d5b4d6478..ddd65d6cc 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1,3 +1,3 @@ -ruby 3.2.2 +ruby 3.4.1 nodejs 20.11.0 yarn 1.22.22 diff --git a/Appraisals b/Appraisals index 21acdaf44..4eafbd31c 100644 --- a/Appraisals +++ b/Appraisals @@ -4,6 +4,8 @@ appraise "rails60" do end appraise "rails61" do + gem "drb" + gem "mutex_m" gem "rails", "~> 6.1" end diff --git a/Gemfile b/Gemfile index 53f5c7305..e272e53f8 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,5 @@ source "https://rubygems.org" -ruby "3.2.2" unless ENV["CI"] && !ENV["DIFF_CHECK_APPRAISAL"] +ruby "3.4.1" unless ENV["CI"] && !ENV["DIFF_CHECK_APPRAISAL"] gemspec diff --git a/Gemfile.lock b/Gemfile.lock index 0c0d0fffc..ae35b9783 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -429,7 +429,7 @@ DEPENDENCIES yard RUBY VERSION - ruby 3.2.2p53 + ruby 3.4.1p0 BUNDLED WITH 2.4.22 diff --git a/gemfiles/pundit21.gemfile b/gemfiles/pundit21.gemfile index 92e44a2f1..68e77cb66 100644 --- a/gemfiles/pundit21.gemfile +++ b/gemfiles/pundit21.gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" -ruby "3.2.2" +ruby "3.4.1" gem "administrate-field-image" gem "faker" diff --git a/gemfiles/rails60.gemfile b/gemfiles/rails60.gemfile index 9ba008ac8..05bdfd45b 100644 --- a/gemfiles/rails60.gemfile +++ b/gemfiles/rails60.gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" -ruby "3.2.2" +ruby "3.4.1" gem "administrate-field-image" gem "faker" diff --git a/gemfiles/rails61.gemfile b/gemfiles/rails61.gemfile index f1c52ec22..1d0bf9fd8 100644 --- a/gemfiles/rails61.gemfile +++ b/gemfiles/rails61.gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" -ruby "3.2.2" +ruby "3.4.1" gem "administrate-field-image" gem "faker" @@ -19,6 +19,8 @@ gem "unicorn" gem "cssbundling-rails", "~> 1.4" gem "jsbundling-rails", "~> 1.3" gem "sprockets-rails", "~> 3.5" +gem "drb" +gem "mutex_m" gem "rails", "~> 6.1" group :development, :test do diff --git a/gemfiles/rails70.gemfile b/gemfiles/rails70.gemfile index 5fa7a1e6a..c18a4163d 100644 --- a/gemfiles/rails70.gemfile +++ b/gemfiles/rails70.gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" -ruby "3.2.2" +ruby "3.4.1" gem "administrate-field-image" gem "faker" diff --git a/gemfiles/rails80.gemfile b/gemfiles/rails80.gemfile index 392d8eb81..def1222d1 100644 --- a/gemfiles/rails80.gemfile +++ b/gemfiles/rails80.gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" -ruby "3.2.2" +ruby "3.4.1" gem "administrate-field-image" gem "faker"