Update to Phoenix 1.6 and chase dependencies

Also bump minimum Elixir to 1.11

1 files changed, 14 insertions, 12 deletions

diff --git a/mix.exs b/mix.exs
index 00c8f7b0d..1efdc4ec9 100644
--- a/mix.exs
+++ b/mix.exs
@@ -5,7 +5,7 @@ defmodule Pleroma.Mixfile do
     [
       app: :pleroma,
       version: version("2.4.53"),
-      elixir: "~> 1.10",
+      elixir: "~> 1.11",
       elixirc_paths: elixirc_paths(Mix.env()),
       compilers: [:phoenix, :gettext] ++ Mix.compilers(),
       elixirc_options: [warnings_as_errors: warnings_as_errors()],
@@ -116,15 +116,19 @@ defmodule Pleroma.Mixfile do
   # Type `mix help deps` for examples and options.
   defp deps do
     [
-      {:phoenix, "~> 1.5.5"},
+      {:phoenix, "~> 1.6.0"},
+      {:phoenix_ecto, "~> 4.4.0"},
+      {:ecto_enum, "~> 1.4"},
+      {:postgrex, ">= 0.0.0"},
+      {:phoenix_html, "~> 3.1"},
+      {:phoenix_live_reload, "~> 1.3.3", only: :dev},
+      {:phoenix_live_view, "~> 0.17.1"},
+      {:phoenix_live_dashboard, "~> 0.6.2"},
+      {:telemetry_metrics, "~> 0.6.1"},
+      {:telemetry_poller, "~> 1.0"},
       {:tzdata, "~> 1.0.3"},
       {:plug_cowboy, "~> 2.3"},
-      {:phoenix_pubsub, "~> 2.0"},
-      {:phoenix_ecto, "~> 4.0"},
-      {:ecto_enum, "~> 1.4"},
-      {:ecto_sql, "~> 3.6.2"},
-      {:postgrex, ">= 0.15.5"},
-      {:oban, "~> 2.3.4"},
+      {:oban, "~> 2.13"},
       {:gettext,
        git: "https://github.com/tusooa/gettext.git",
        ref: "72fb2496b6c5280ed911bdc3756890e7f38a4808",
@@ -133,7 +137,6 @@ defmodule Pleroma.Mixfile do
       {:trailing_format_plug, "~> 0.0.7"},
       {:fast_sanitize, "~> 0.2.0"},
       {:html_entities, "~> 0.5", override: true},
-      {:phoenix_html, "~> 3.1", override: true},
       {:calendar, "~> 1.0"},
       {:cachex, "~> 3.2"},
       {:poison, "~> 3.0", override: true},
@@ -155,7 +158,7 @@ defmodule Pleroma.Mixfile do
       {:cors_plug, "~> 2.0"},
       {:web_push_encryption, "~> 0.3.1"},
       {:swoosh, "~> 1.0"},
-      {:phoenix_swoosh, "~> 0.3"},
+      {:phoenix_swoosh, "~> 1.1"},
       {:gen_smtp, "~> 0.13"},
       {:ex_syslogger, "~> 1.4"},
       {:floki, "~> 0.27"},
@@ -163,7 +166,7 @@ defmodule Pleroma.Mixfile do
       {:ueberauth, "~> 0.4"},
       {:linkify, "~> 0.5.2"},
       {:http_signatures, "~> 0.1.1"},
-      {:telemetry, "~> 0.3"},
+      {:telemetry, "~> 1.0.0", override: true},
       {:poolboy, "~> 1.5"},
       {:prometheus, "~> 4.6"},
       {:prometheus_ex,
@@ -197,7 +200,6 @@ defmodule Pleroma.Mixfile do
       {:majic, "~> 1.0"},
       {:eblurhash, "~> 1.2.2"},
       {:open_api_spex, "~> 3.10"},
-      {:phoenix_live_dashboard, "~> 0.6.2"},
       {:ecto_psql_extras, "~> 0.6"},
 
       # indirect dependency version override