Merge develop into Phoenix upstream migration

mix.exs

@@ -4,7 +4,7 @@ defmodule Pleroma.Mixfile do
   def project do
     [
       app: :pleroma,
-      version: version("2.10.0"),
+      version: version("2.10.2"),
       elixir: "~> 1.15",
       elixirc_paths: elixirc_paths(Mix.env()),
       compilers: Mix.compilers(),
@@ -114,7 +114,7 @@ defmodule Pleroma.Mixfile do
     if Version.match?(System.version(), "<1.15.0-rc.0") do
       []
     else
-      [{:logger_backends, "~> 1.0"}]
+      [{:logger_backends, "~> 1.0.0"}]
     end
   end
 
@@ -124,61 +124,62 @@ defmodule Pleroma.Mixfile do
   defp deps do
     [
       {:phoenix, "~> 1.8.0"},
-      {:phoenix_ecto, "~> 4.4"},
-      {:ecto_sql, "~> 3.10"},
+      {:phoenix_ecto, "~> 4.6"},
+      {:ecto_sql, "~> 3.13"},
       {:ecto_enum, "~> 1.4"},
-      {:postgrex, ">= 0.20.0"},
+      {:postgrex, ">= 0.21.1"},
       {:phoenix_html, "~> 3.3"},
-      {:phoenix_live_view, "~> 1.1.0"},
-      {:phoenix_live_dashboard, "~> 0.8.0"},
+      {:phoenix_live_view, "~> 1.1.19"},
+      {:phoenix_live_dashboard, "~> 0.8.7"},
       {:telemetry_metrics, "~> 0.6"},
-      {:telemetry_poller, "~> 1.0"},
-      {:tzdata, "~> 1.0.3"},
+      {:telemetry_poller, "~> 1.3"},
+      {:tzdata, "~> 1.0.5"},
       {:plug_cowboy, "~> 2.7"},
-      {:oban, "~> 2.19.0"},
+      {:oban, "~> 2.19.4"},
       {:oban_plugins_lazarus,
        git: "https://git.pleroma.social/pleroma/elixir-libraries/oban_plugins_lazarus.git",
        ref: "e49fc355baaf0e435208bf5f534d31e26e897711"},
       {:oban_web, "~> 2.11"},
-      {:gettext, "~> 0.20"},
-      {:bcrypt_elixir, "~> 2.2"},
+      {:gettext, "~> 0.24"},
+      {:bcrypt_elixir, "~> 2.3"},
       {:trailing_format_plug, "~> 0.0.7"},
-      {:fast_sanitize, "~> 0.2.0"},
+      {:fast_sanitize, "~> 0.2.3"},
       {:html_entities, "~> 0.5", override: true},
       {:calendar, "~> 1.0"},
-      {:cachex, "~> 3.2"},
-      {:tesla, "~> 1.11"},
+      {:cachex, "~> 3.6"},
+      {:tesla, "~> 1.15"},
       {:castore, "~> 1.0"},
       {:cowlib, "~> 2.15"},
       {:gun, "~> 2.2"},
-      {:finch, "~> 0.15"},
-      {:jason, "~> 1.2"},
-      {:mogrify, "~> 0.9.0", override: "true"},
-      {:ex_aws, "~> 2.1.6"},
-      {:ex_aws_s3, "~> 2.0"},
-      {:sweet_xml, "~> 0.7.2"},
+      {:finch, "~> 0.20"},
+      {:jason, "~> 1.4"},
+      {:mogrify, "~> 0.9.3", override: true},
+      {:ex_aws, "~> 2.1.9"},
+      {:ex_aws_s3, "~> 2.5"},
+      {:sweet_xml, "~> 0.7.5"},
       {:earmark, "1.4.46"},
       {:bbcode_pleroma, "~> 0.2.0"},
+      {:pleroma_mfm_parser, "~> 0.2.1"},
       {:cors_plug, "~> 2.0"},
       {:web_push_encryption, "~> 0.3.1"},
-      {:swoosh, "~> 1.16.9"},
-      {:phoenix_swoosh, "~> 1.1"},
-      {:gen_smtp, "~> 0.13"},
-      {:mua, "~> 0.2.0"},
-      {:mail, "~> 0.3.0"},
-      {:ex_syslogger, "~> 1.4"},
-      {:floki, "~> 0.35"},
-      {:timex, "~> 3.6"},
-      {:ueberauth, "~> 0.4"},
+      {:swoosh, "~> 1.16.12"},
+      {:phoenix_swoosh, "~> 1.2"},
+      {:gen_smtp, "~> 0.15"},
+      {:mua, "~> 0.2.4"},
+      {:mail, "~> 0.3.1"},
+      {:ex_syslogger, "~> 1.5"},
+      {:floki, "~> 0.38"},
+      {:timex, "~> 3.7"},
+      {:ueberauth, "~> 0.10"},
       {:linkify, "~> 0.5.3"},
       {:http_signatures, "~> 0.1.2"},
       {:telemetry, "~> 1.0.0", override: true},
       {:poolboy, "~> 1.5"},
       {:prom_ex, "~> 1.9"},
       {:recon, "~> 2.5"},
-      {:joken, "~> 2.0"},
+      {:joken, "~> 2.6"},
       {:pot, "~> 1.0"},
-      {:ex_const, "~> 0.2"},
+      {:ex_const, "~> 0.3"},
       {:plug_static_index_html, "~> 1.0.0"},
       {:flake_id, "~> 0.1.0"},
       {:concurrent_limiter, "~> 0.1.1"},
@@ -189,31 +190,31 @@ defmodule Pleroma.Mixfile do
        git: "https://git.pleroma.social/pleroma/elixir-libraries/elixir-captcha.git",
        ref: "e7b7cc34cc16b383461b966484c297e4ec9aeef6"},
       {:restarter, path: "./restarter"},
-      {:majic, "~> 1.0"},
-      {:open_api_spex, "~> 3.16"},
+      {:majic, "~> 1.1"},
+      {:open_api_spex, "~> 3.22"},
       {:ecto_psql_extras, "~> 0.8"},
-      {:vix, "~> 0.26.0"},
-      {:elixir_make, "~> 0.7.7", override: true},
+      {:vix, "~> 0.36"},
+      {:elixir_make, "~> 0.7.8", override: true},
       {:blurhash, "~> 0.1.0", hex: :rinpatch_blurhash},
       {:exile, "~> 0.10.0"},
-      {:bandit, "~> 1.5.2"},
-      {:websock_adapter, "~> 0.5.6"},
+      {:bandit, "~> 1.10"},
+      {:websock_adapter, "~> 0.5.8"},
       {:oban_live_dashboard, "~> 0.1.1"},
       {:multipart, "~> 0.4.0", optional: true},
-      {:argon2_elixir, "~> 4.0"},
+      {:argon2_elixir, "~> 4.1"},
 
       ## dev & test
       {:phoenix_live_reload, "~> 1.3.3", only: :dev},
-      {:poison, "~> 3.0", only: :test},
-      {:ex_doc, "~> 0.22", only: :dev, runtime: false},
-      {:ex_machina, "~> 2.4", only: :test},
+      {:poison, "~> 3.1", only: :test},
+      {:ex_doc, "~> 0.38", only: :dev, runtime: false},
+      {:ex_machina, "~> 2.8", only: :test},
       {:credo, "~> 1.7", only: [:dev, :test], runtime: false},
-      {:mock, "~> 0.3.5", only: :test},
+      {:mock, "~> 0.3.9", only: :test},
       {:covertool, "~> 2.0", only: :test},
-      {:hackney, "~> 1.18.0", override: true},
-      {:mox, "~> 1.0", only: :test},
+      {:hackney, "~> 1.20.1", override: true},
+      {:mox, "~> 1.2", only: :test},
       {:websockex, "~> 0.4.3", only: :test},
-      {:benchee, "~> 1.0", only: :benchmark},
+      {:benchee, "~> 1.4", only: :benchmark},
       {:dialyxir, "~> 1.4", only: [:dev, :test], runtime: false}
     ] ++ oauth_deps() ++ logger_deps()
   end