summaryrefslogtreecommitdiff
path: root/mix.exs
diff options
context:
space:
mode:
Diffstat (limited to 'mix.exs')
-rw-r--r--mix.exs13
1 files changed, 7 insertions, 6 deletions
diff --git a/mix.exs b/mix.exs
index 77e4c19ad..5caa6f484 100644
--- a/mix.exs
+++ b/mix.exs
@@ -4,8 +4,8 @@ defmodule Pleroma.Mixfile do
def project do
[
app: :pleroma,
- version: version("2.4.52"),
- elixir: "~> 1.9",
+ version: version("2.4.53"),
+ elixir: "~> 1.10",
elixirc_paths: elixirc_paths(Mix.env()),
compilers: [:phoenix, :gettext] ++ Mix.compilers(),
elixirc_options: [warnings_as_errors: warnings_as_errors()],
@@ -79,7 +79,8 @@ defmodule Pleroma.Mixfile do
:quack,
:fast_sanitize,
:os_mon,
- :ssl
+ :ssl,
+ :esshd
],
included_applications: [:ex_syslogger]
]
@@ -165,8 +166,8 @@ defmodule Pleroma.Mixfile do
{:poolboy, "~> 1.5"},
{:prometheus, "~> 4.6"},
{:prometheus_ex,
- git: "https://git.pleroma.social/pleroma/elixir-libraries/prometheus.ex.git",
- ref: "a4e9beb3c1c479d14b352fd9d6dd7b1f6d7deee5",
+ git: "https://github.com/lanodan/prometheus.ex.git",
+ branch: "fix/elixir-1.14",
override: true},
{:prometheus_plugs, "~> 1.1"},
{:prometheus_phoenix, "~> 1.3"},
@@ -209,7 +210,7 @@ defmodule Pleroma.Mixfile do
{:covertool, "~> 2.0", only: :test},
{:hackney, "~> 1.18.0", override: true},
{:mox, "~> 1.0", only: :test},
- {:websocket_client, git: "https://github.com/jeremyong/websocket_client.git", only: :test}
+ {:websockex, "~> 0.4.3", only: :test}
] ++ oauth_deps()
end