projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into foxing-patch-1
[akkoma]
/
mix.exs
diff --git
a/mix.exs
b/mix.exs
index 4898591b1d79eb4256256f9ae92de4ec1d7d34a6..098ea15b036150740780a1526661e424daf93a8d 100644
(file)
--- a/
mix.exs
+++ b/
mix.exs
@@
-4,7
+4,7
@@
defmodule Pleroma.Mixfile do
def project do
[
app: :pleroma,
def project do
[
app: :pleroma,
- version: version("3.
5.0
"),
+ version: version("3.
7.1
"),
elixir: "~> 1.12",
elixirc_paths: elixirc_paths(Mix.env()),
compilers: [:phoenix] ++ Mix.compilers(),
elixir: "~> 1.12",
elixirc_paths: elixirc_paths(Mix.env()),
compilers: [:phoenix] ++ Mix.compilers(),
@@
-143,9
+143,7
@@
defmodule Pleroma.Mixfile do
{:sweet_xml, "~> 0.7.2"},
{:earmark, "~> 1.4.15"},
{:bbcode_pleroma, "~> 0.2.0"},
{:sweet_xml, "~> 0.7.2"},
{:earmark, "~> 1.4.15"},
{:bbcode_pleroma, "~> 0.2.0"},
- {:crypt,
- git: "https://github.com/msantos/crypt.git",
- ref: "f75cd55325e33cbea198fb41fe41871392f8fb76"},
+ {:argon2_elixir, "~> 3.0.0"},
{:cors_plug, "~> 2.0"},
{:web_push_encryption, "~> 0.3.1"},
{:swoosh, "~> 1.0"},
{:cors_plug, "~> 2.0"},
{:web_push_encryption, "~> 0.3.1"},
{:swoosh, "~> 1.0"},
@@
-202,7
+200,7
@@
defmodule Pleroma.Mixfile do
ref: "1c1b99ea41a457761383d81aaf6a606913996fe7",
only: [:dev, :test],
runtime: false},
ref: "1c1b99ea41a457761383d81aaf6a606913996fe7",
only: [:dev, :test],
runtime: false},
- {:mock, "~> 0.3.
5
", only: :test},
+ {:mock, "~> 0.3.
7
", only: :test},
{:excoveralls, "0.15.1", only: :test},
{:mox, "~> 1.0", only: :test},
{:websockex, "~> 0.4.3", only: :test},
{:excoveralls, "0.15.1", only: :test},
{:mox, "~> 1.0", only: :test},
{:websockex, "~> 0.4.3", only: :test},