projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'finch' of git.pleroma.social:pleroma/pleroma into finch
[akkoma]
/
mix.exs
diff --git
a/mix.exs
b/mix.exs
index a4bacba8e3dc481bf87d5898ead7ff8df13af914..360d499050ab28766a1ae676079c400b6b44486d 100644
(file)
--- a/
mix.exs
+++ b/
mix.exs
@@
-4,11
+4,11
@@
defmodule Pleroma.Mixfile do
def project do
[
app: :pleroma,
def project do
[
app: :pleroma,
- version: version("2.
3.50
"),
+ version: version("2.
4.51
"),
elixir: "~> 1.9",
elixirc_paths: elixirc_paths(Mix.env()),
compilers: [:phoenix, :gettext] ++ Mix.compilers(),
elixir: "~> 1.9",
elixirc_paths: elixirc_paths(Mix.env()),
compilers: [:phoenix, :gettext] ++ Mix.compilers(),
- elixirc_options: [warnings_as_errors: warnings_as_errors(
Mix.env()
)],
+ elixirc_options: [warnings_as_errors: warnings_as_errors()],
xref: [exclude: [:eldap]],
start_permanent: Mix.env() == :prod,
aliases: aliases(),
xref: [exclude: [:eldap]],
start_permanent: Mix.env() == :prod,
aliases: aliases(),
@@
-79,6
+79,7
@@
defmodule Pleroma.Mixfile do
:comeonin,
:quack,
:fast_sanitize,
:comeonin,
:quack,
:fast_sanitize,
+ :os_mon,
:ssl
],
included_applications: [:ex_syslogger]
:ssl
],
included_applications: [:ex_syslogger]
@@
-86,12
+87,11
@@
defmodule Pleroma.Mixfile do
end
# Specifies which paths to compile per environment.
end
# Specifies which paths to compile per environment.
- defp elixirc_paths(:benchmark), do: ["lib", "benchmarks"]
+ defp elixirc_paths(:benchmark), do: ["lib", "benchmarks"
, "priv/scrubbers"
]
defp elixirc_paths(:test), do: ["lib", "test/support"]
defp elixirc_paths(_), do: ["lib"]
defp elixirc_paths(:test), do: ["lib", "test/support"]
defp elixirc_paths(_), do: ["lib"]
- defp warnings_as_errors(:prod), do: false
- defp warnings_as_errors(_), do: true
+ defp warnings_as_errors, do: System.get_env("CI") == "true"
# Specifies OAuth dependencies.
defp oauth_deps do
# Specifies OAuth dependencies.
defp oauth_deps do
@@
-121,8
+121,7
@@
defmodule Pleroma.Mixfile do
{:phoenix_pubsub, "~> 2.0"},
{:phoenix_ecto, "~> 4.0"},
{:ecto_enum, "~> 1.4"},
{:phoenix_pubsub, "~> 2.0"},
{:phoenix_ecto, "~> 4.0"},
{:ecto_enum, "~> 1.4"},
- {:ecto_explain, "~> 0.1.2"},
- {:ecto_sql, "~> 3.4.4"},
+ {:ecto_sql, "~> 3.6.2"},
{:postgrex, ">= 0.15.5"},
{:oban, "~> 2.3.4"},
{:gettext, "~> 0.18"},
{:postgrex, ">= 0.15.5"},
{:oban, "~> 2.3.4"},
{:gettext, "~> 0.18"},
@@
-130,27
+129,28
@@
defmodule Pleroma.Mixfile do
{:trailing_format_plug, "~> 0.0.7"},
{:fast_sanitize, "~> 0.2.0"},
{:html_entities, "~> 0.5", override: true},
{:trailing_format_plug, "~> 0.0.7"},
{:fast_sanitize, "~> 0.2.0"},
{:html_entities, "~> 0.5", override: true},
- {:phoenix_html, "~>
2.14"
},
+ {:phoenix_html, "~>
3.1", override: true
},
{:calendar, "~> 1.0"},
{:cachex, "~> 3.2"},
{:poison, "~> 3.0", override: true},
{:tesla, "~> 1.4.0", override: true},
{:castore, "~> 0.1"},
{:cowlib, "~> 2.9", override: true},
{:calendar, "~> 1.0"},
{:cachex, "~> 3.2"},
{:poison, "~> 3.0", override: true},
{:tesla, "~> 1.4.0", override: true},
{:castore, "~> 0.1"},
{:cowlib, "~> 2.9", override: true},
- {:gun,
-
github: "ninenines/gun", ref: "921c47146b2d9567eac7e9a4d2ccc60fffd4f327", override: true
},
+ {:gun,
"~> 2.0.0-rc.1", override: true},
+
{:finch, "~> 0.10.0"
},
{:jason, "~> 1.2"},
{:jason, "~> 1.2"},
- {:mogrify, "~> 0.
7.4
"},
+ {:mogrify, "~> 0.
9.1
"},
{:ex_aws, "~> 2.1.6"},
{:ex_aws_s3, "~> 2.0"},
{:sweet_xml, "~> 0.6.6"},
{:ex_aws, "~> 2.1.6"},
{:ex_aws_s3, "~> 2.0"},
{:sweet_xml, "~> 0.6.6"},
- {:earmark, "1.4.15"},
+ {:earmark, "
~>
1.4.15"},
{:bbcode_pleroma, "~> 0.2.0"},
{:crypt,
{:bbcode_pleroma, "~> 0.2.0"},
{:crypt,
- git: "https://git
.pleroma.social/pleroma/elixir-librarie
s/crypt.git",
- ref: "
cf2aa3f11632e8b0634810a15b3e612c7526f6a3
"},
+ git: "https://git
hub.com/msanto
s/crypt.git",
+ ref: "
f75cd55325e33cbea198fb41fe41871392f8fb76
"},
{:cors_plug, "~> 2.0"},
{:cors_plug, "~> 2.0"},
- {:web_push_encryption, "~> 0.3"},
+ {:web_push_encryption,
+ git: "https://github.com/lanodan/elixir-web-push-encryption.git", branch: "bugfix/otp-24"},
{:swoosh, "~> 1.0"},
{:phoenix_swoosh, "~> 0.3"},
{:gen_smtp, "~> 0.13"},
{:swoosh, "~> 1.0"},
{:phoenix_swoosh, "~> 0.3"},
{:gen_smtp, "~> 0.13"},
@@
-158,8
+158,8
@@
defmodule Pleroma.Mixfile do
{:floki, "~> 0.27"},
{:timex, "~> 3.6"},
{:ueberauth, "~> 0.4"},
{:floki, "~> 0.27"},
{:timex, "~> 3.6"},
{:ueberauth, "~> 0.4"},
- {:linkify, "~> 0.5.
0
"},
- {:http_signatures, "~> 0.1.
0
"},
+ {:linkify, "~> 0.5.
1
"},
+ {:http_signatures, "~> 0.1.
1
"},
{:telemetry, "~> 0.3"},
{:poolboy, "~> 1.5"},
{:prometheus, "~> 4.6"},
{:telemetry, "~> 0.3"},
{:poolboy, "~> 1.5"},
{:prometheus, "~> 4.6"},
@@
-178,7
+178,7
@@
defmodule Pleroma.Mixfile do
{:quack, "~> 0.1.1"},
{:joken, "~> 2.0"},
{:benchee, "~> 1.0"},
{:quack, "~> 0.1.1"},
{:joken, "~> 2.0"},
{:benchee, "~> 1.0"},
- {:pot, "~>
0.11
"},
+ {:pot, "~>
1.0
"},
{:esshd, "~> 0.1.0", runtime: Application.get_env(:esshd, :enabled, false)},
{:ex_const, "~> 0.2"},
{:plug_static_index_html, "~> 1.0.0"},
{:esshd, "~> 0.1.0", runtime: Application.get_env(:esshd, :enabled, false)},
{:ex_const, "~> 0.2"},
{:plug_static_index_html, "~> 1.0.0"},
@@
-193,13
+193,14
@@
defmodule Pleroma.Mixfile do
git: "https://git.pleroma.social/pleroma/elixir-libraries/elixir-captcha.git",
ref: "e0f16822d578866e186a0974d65ad58cddc1e2ab"},
{:restarter, path: "./restarter"},
git: "https://git.pleroma.social/pleroma/elixir-libraries/elixir-captcha.git",
ref: "e0f16822d578866e186a0974d65ad58cddc1e2ab"},
{:restarter, path: "./restarter"},
- {:majic,
- git: "https://git.pleroma.social/pleroma/elixir-libraries/majic.git",
- ref: "289cda1b6d0d70ccb2ba508a2b0bd24638db2880"},
- {:eblurhash,
- git: "https://github.com/zotonic/eblurhash.git",
- ref: "04a0b76eadf4de1be17726f39b6313b88708fd12"},
+ {:majic, "~> 1.0"},
+ {:eblurhash, "~> 1.1.0"},
{:open_api_spex, "~> 3.10"},
{:open_api_spex, "~> 3.10"},
+ {:phoenix_live_dashboard, "~> 0.6.2"},
+ {:ecto_psql_extras, "~> 0.6"},
+
+ # indirect dependency version override
+ {:plug, "~> 1.10.4", override: true},
## dev & test
{:ex_doc, "~> 0.22", only: :dev, runtime: false},
## dev & test
{:ex_doc, "~> 0.22", only: :dev, runtime: false},
@@
-208,10
+209,7
@@
defmodule Pleroma.Mixfile do
{:mock, "~> 0.3.5", only: :test},
# temporary downgrade for excoveralls, hackney until hackney max_connections bug will be fixed
{:excoveralls, "0.12.3", only: :test},
{:mock, "~> 0.3.5", only: :test},
# temporary downgrade for excoveralls, hackney until hackney max_connections bug will be fixed
{:excoveralls, "0.12.3", only: :test},
- {:hackney,
- git: "https://git.pleroma.social/pleroma/elixir-libraries/hackney.git",
- ref: "7d7119f0651515d6d7669c78393fd90950a3ec6e",
- override: true},
+ {:hackney, "~> 1.18.0", override: true},
{:mox, "~> 1.0", only: :test},
{:websocket_client, git: "https://github.com/jeremyong/websocket_client.git", only: :test}
] ++ oauth_deps()
{:mox, "~> 1.0", only: :test},
{:websocket_client, git: "https://github.com/jeremyong/websocket_client.git", only: :test}
] ++ oauth_deps()