From 56b3dfe6e5c9d6a8a4853898693043d5cae683ea Mon Sep 17 00:00:00 2001 From: Alan Guo Xiang Tan Date: Tue, 21 May 2024 09:20:01 +0800 Subject: [PATCH] Backport dependencies upgrade to make stable compatible with Ruby 3.3 (#27091) * DEV: Drop fast_xs gem (#26442) Why this gem? This gem was added close to 10 years ago to speed up the generation of RSS feeds. However, RSS feeds generation do not even call `String#to_xs` anymore and the `fast_xs` gem does not install on macOS without using the following workaround: `bundle config build.fast_xs --with-cflags=\"-Wno-incompatible-pointer-types\"` Therefore, we have decided to drop the gem. * DEV: Drop gc_tracer gem (#26441) Why this change? This gem is failing to install cleanly on macOS and the following workaround is required: `bundle config build.gc_tracer --with-cflags=\"-Wno-incompatible-pointer-types\"` Instead of requiring this workaround, we have decided to drop `gc_tracer` because it isn't a gem that is used anymore. * DEV: Add `csv` to Gemfile to resolve Ruby 3.3 deprecation warning (#26995) The following warning is being printed when running Discourse with Ruby 3.3 `warning: /usr/local/lib/ruby/3.3.0/csv.rb was loaded from the standard library, but will no longer be part of the default gems since Ruby 3.4.0. Add csv to your Gemfile or gemspec.` * DEV: Add `mutex_m` and `drb` to Gemfile to remove deprecation warning (#27012) Resolves the following deprecation warnings when running Discourse on Ruby 3.3 ``` warning: /Users/tgxworld/.asdf/installs/ruby/3.3.1/lib/ruby/3.3.0/mutex_m.rb was loaded from the standard library, but will no longer be part of the default gems since Ruby 3.4.0. Add mutex_m to your Gemfile or gemspec. Also contact author of activesupport-7.0.8.1 to add mutex_m into its gemspec. warning: /Users/tgxworld/.asdf/installs/ruby/3.3.1/lib/ruby/3.3.0/drb.rb was loaded from the standard library, but will no longer be part of the default gems since Ruby 3.4.0. Add drb to your Gemfile or gemspec. Also contact author of activesupport-7.0.8.1 to add drb into its gemspec. ``` * Build(deps): Bump google-protobuf from 3.25.2 to 3.25.3 (#25709) Bumps [google-protobuf](https://github.com/protocolbuffers/protobuf) from 3.25.2 to 3.25.3. - [Release notes](https://github.com/protocolbuffers/protobuf/releases) - [Changelog](https://github.com/protocolbuffers/protobuf/blob/main/protobuf_release.bzl) - [Commits](https://github.com/protocolbuffers/protobuf/commits) --- updated-dependencies: - dependency-name: google-protobuf dependency-type: indirect update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Build(deps): Bump actionview_precompiler from 0.3.0 to 0.4.0 (#25977) Bumps [actionview_precompiler](https://github.com/jhawthorn/actionview_precompiler) from 0.3.0 to 0.4.0. - [Commits](https://github.com/jhawthorn/actionview_precompiler/compare/v0.3.0...v0.4.0) --- updated-dependencies: - dependency-name: actionview_precompiler dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .licensed.yml | 2 ++ Gemfile | 9 +++++---- Gemfile.lock | 21 ++++++++++++--------- 3 files changed, 19 insertions(+), 13 deletions(-) diff --git a/.licensed.yml b/.licensed.yml index cd9157732d2..c5903c31e0c 100644 --- a/.licensed.yml +++ b/.licensed.yml @@ -30,6 +30,7 @@ ignored: - strscan # Ruby (default gem) - timeout # Ruby (default gem) - uri # Ruby (default gem) + - mutex_m # BSD-2-Clause reviewed: bundler: @@ -64,3 +65,4 @@ reviewed: - tilt # MIT - unf # BSD-2-Clause - unicorn # Ruby or GPLv2/GPLv3 + - drb # BSD-2-Clause diff --git a/Gemfile b/Gemfile index f73aeecb6ba..bae9d8b9852 100644 --- a/Gemfile +++ b/Gemfile @@ -55,8 +55,6 @@ gem "message_bus" gem "rails_multisite" -gem "fast_xs", platform: :ruby - gem "fastimage" gem "aws-sdk-s3", require: false @@ -199,8 +197,6 @@ gem "puma", require: false gem "rbtrace", require: false, platform: :mri -gem "gc_tracer", require: false, platform: :mri - # required for feed importing and embedding gem "ruby-readability", require: false @@ -269,3 +265,8 @@ gem "net-http" gem "cgi", ">= 0.3.6", require: false gem "tzinfo-data" +gem "csv", require: false + +# TODO: Can be removed once we upgrade to Rails 7.1 +gem "mutex_m" +gem "drb" diff --git a/Gemfile.lock b/Gemfile.lock index 0ae09f3ea28..03817d62fd7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -33,7 +33,7 @@ GEM erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - actionview_precompiler (0.3.0) + actionview_precompiler (0.4.0) actionview (>= 6.0.a) active_model_serializers (0.8.4) activemodel (>= 3.0) @@ -117,6 +117,7 @@ GEM crass (1.0.6) css_parser (1.16.0) addressable + csv (3.3.0) date (3.3.4) debug_inspector (1.2.0) diff-lcs (1.5.0) @@ -130,6 +131,7 @@ GEM faker (~> 2.16) literate_randomizer docile (1.4.0) + drb (2.2.1) email_reply_trimmer (0.1.13) erubi (1.12.0) excon (0.109.0) @@ -146,17 +148,15 @@ GEM faraday-retry (2.2.0) faraday (~> 2.0) fast_blank (1.0.1) - fast_xs (0.8.0) fastimage (2.3.0) ffi (1.16.3) fspath (3.1.2) - gc_tracer (1.5.1) globalid (1.2.1) activesupport (>= 6.1) - google-protobuf (3.25.2-aarch64-linux) - google-protobuf (3.25.2-arm64-darwin) - google-protobuf (3.25.2-x86_64-darwin) - google-protobuf (3.25.2-x86_64-linux) + google-protobuf (3.25.3-aarch64-linux) + google-protobuf (3.25.3-arm64-darwin) + google-protobuf (3.25.3-x86_64-darwin) + google-protobuf (3.25.3-x86_64-linux) guess_html_encoding (0.0.11) hana (1.3.7) hashdiff (1.1.0) @@ -234,6 +234,7 @@ GEM multi_json (1.15.0) multi_xml (0.6.0) mustache (1.1.1) + mutex_m (0.2.0) net-http (0.4.1) uri net-imap (0.4.9.1) @@ -522,6 +523,7 @@ PLATFORMS arm64-darwin-20 arm64-darwin-21 arm64-darwin-22 + arm64-darwin-23 x86_64-darwin-18 x86_64-darwin-19 x86_64-darwin-20 @@ -554,11 +556,13 @@ DEPENDENCIES cose cppjieba_rb css_parser + csv diffy digest discourse-fonts discourse-seed-fu discourse_dev_assets + drb email_reply_trimmer excon execjs @@ -568,9 +572,7 @@ DEPENDENCIES faraday faraday-retry fast_blank - fast_xs fastimage - gc_tracer highline htmlentities http_accept_language @@ -599,6 +601,7 @@ DEPENDENCIES mocha multi_json mustache + mutex_m net-http net-imap net-pop