projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Formatting: Do not use \n and prefer <br> instead
[akkoma]
/
mix.exs
diff --git
a/mix.exs
b/mix.exs
index c2e0b940fda7086553499e419d55d9bc83f9f7ea..b55a79a77cad111d6d03bab333cf0f65163eae11 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("
1.1.50
"),
+ version: version("
2.0.1
"),
elixir: "~> 1.8",
elixirc_paths: elixirc_paths(Mix.env()),
compilers: [:phoenix, :gettext] ++ Mix.compilers(),
elixir: "~> 1.8",
elixirc_paths: elixirc_paths(Mix.env()),
compilers: [:phoenix, :gettext] ++ Mix.compilers(),
- elixirc_options: [warnings_as_errors:
true
],
+ elixirc_options: [warnings_as_errors:
warnings_as_errors(Mix.env())
],
xref: [exclude: [:eldap]],
start_permanent: Mix.env() == :prod,
aliases: aliases(),
xref: [exclude: [:eldap]],
start_permanent: Mix.env() == :prod,
aliases: aliases(),
@@
-63,7
+63,7
@@
defmodule Pleroma.Mixfile do
def application do
[
mod: {Pleroma.Application, []},
def application do
[
mod: {Pleroma.Application, []},
- extra_applications: [:logger, :runtime_tools, :comeonin, :quack, :fast_sanitize
, :swarm
],
+ extra_applications: [:logger, :runtime_tools, :comeonin, :quack, :fast_sanitize],
included_applications: [:ex_syslogger]
]
end
included_applications: [:ex_syslogger]
]
end
@@
-73,6
+73,11
@@
defmodule Pleroma.Mixfile do
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
+ # Uncomment this if you need testing configurable_from_database logic
+ # defp warnings_as_errors(:dev), do: false
+ defp warnings_as_errors(_), do: true
+
# Specifies OAuth dependencies.
defp oauth_deps do
oauth_strategy_packages =
# Specifies OAuth dependencies.
defp oauth_deps do
oauth_strategy_packages =
@@
-101,10
+106,9
@@
defmodule Pleroma.Mixfile do
{:phoenix_pubsub, "~> 1.1"},
{:phoenix_ecto, "~> 4.0"},
{:ecto_enum, "~> 1.4"},
{:phoenix_pubsub, "~> 1.1"},
{:phoenix_ecto, "~> 4.0"},
{:ecto_enum, "~> 1.4"},
- {:ecto_sql, "~> 3.2"},
+ {:ecto_sql, "~> 3.
3.
2"},
{:postgrex, ">= 0.13.5"},
{:postgrex, ">= 0.13.5"},
- {:oban, "~> 0.12.0"},
- {:quantum, "~> 2.3"},
+ {:oban, "~> 0.12.1"},
{:gettext, "~> 0.15"},
{:comeonin, "~> 4.1.1"},
{:pbkdf2_elixir, "~> 0.12.3"},
{:gettext, "~> 0.15"},
{:comeonin, "~> 4.1.1"},
{:pbkdf2_elixir, "~> 0.12.3"},
@@
-113,7
+117,7
@@
defmodule Pleroma.Mixfile do
{:html_entities, "~> 0.5", override: true},
{:phoenix_html, "~> 2.10"},
{:calendar, "~> 0.17.4"},
{:html_entities, "~> 0.5", override: true},
{:phoenix_html, "~> 2.10"},
{:calendar, "~> 0.17.4"},
- {:cachex, "~> 3.
0.
2"},
+ {:cachex, "~> 3.2"},
{:poison, "~> 3.0", override: true},
{:tesla, "~> 1.3", override: true},
{:jason, "~> 1.0"},
{:poison, "~> 3.0", override: true},
{:tesla, "~> 1.3", override: true},
{:jason, "~> 1.0"},
@@
-122,9
+126,9
@@
defmodule Pleroma.Mixfile do
{:ex_aws_s3, "~> 2.0"},
{:sweet_xml, "~> 0.6.6"},
{:earmark, "~> 1.3"},
{:ex_aws_s3, "~> 2.0"},
{:sweet_xml, "~> 0.6.6"},
{:earmark, "~> 1.3"},
- {:bbcode
, "~> 0.1.1
"},
+ {:bbcode
_pleroma, "~> 0.2.0
"},
{:ex_machina, "~> 2.3", only: :test},
{:ex_machina, "~> 2.3", only: :test},
- {:credo, "~>
0.9.3", only: [:dev, :test]
},
+ {:credo, "~>
1.1.0", only: [:dev, :test], runtime: false
},
{:mock, "~> 0.3.3", only: :test},
{:crypt,
git: "https://github.com/msantos/crypt", ref: "1f2b58927ab57e72910191a7ebaeff984382a1d3"},
{:mock, "~> 0.3.3", only: :test},
{:crypt,
git: "https://github.com/msantos/crypt", ref: "1f2b58927ab57e72910191a7ebaeff984382a1d3"},
@@
-135,8
+139,8
@@
defmodule Pleroma.Mixfile do
{:phoenix_swoosh, "~> 0.2"},
{:gen_smtp, "~> 0.13"},
{:websocket_client, git: "https://github.com/jeremyong/websocket_client.git", only: :test},
{:phoenix_swoosh, "~> 0.2"},
{:gen_smtp, "~> 0.13"},
{:websocket_client, git: "https://github.com/jeremyong/websocket_client.git", only: :test},
- {:
floki, "~> 0.23.0
"},
- {:
ex_syslogger, github: "slashmili/ex_syslogger", tag: "1.4.0
"},
+ {:
ex_syslogger, "~> 1.4
"},
+ {:
floki, "~> 0.25
"},
{:timex, "~> 3.5"},
{:ueberauth, "~> 0.4"},
{:auto_linker,
{:timex, "~> 3.5"},
{:ueberauth, "~> 0.4"},
{:auto_linker,
@@
-151,14
+155,14
@@
defmodule Pleroma.Mixfile do
{:prometheus_plugs, "~> 1.1"},
{:prometheus_phoenix, "~> 1.3"},
{:prometheus_ecto, "~> 1.4"},
{:prometheus_plugs, "~> 1.1"},
{:prometheus_phoenix, "~> 1.3"},
{:prometheus_ecto, "~> 1.4"},
- {:recon,
github: "ferd/recon", tag: "2.4.0
"},
+ {:recon,
"~> 2.5
"},
{:quack, "~> 0.1.1"},
{:joken, "~> 2.0"},
{:benchee, "~> 1.0"},
{:esshd, "~> 0.1.0", runtime: Application.get_env(:esshd, :enabled, false)},
{:ex_const, "~> 0.2"},
{:plug_static_index_html, "~> 1.0.0"},
{:quack, "~> 0.1.1"},
{:joken, "~> 2.0"},
{:benchee, "~> 1.0"},
{:esshd, "~> 0.1.0", runtime: Application.get_env(:esshd, :enabled, false)},
{:ex_const, "~> 0.2"},
{:plug_static_index_html, "~> 1.0.0"},
- {:excoveralls, "~> 0.1
1
.1", only: :test},
+ {:excoveralls, "~> 0.1
2
.1", only: :test},
{:flake_id, "~> 0.1.0"},
{:remote_ip,
git: "https://git.pleroma.social/pleroma/remote_ip.git",
{:flake_id, "~> 0.1.0"},
{:remote_ip,
git: "https://git.pleroma.social/pleroma/remote_ip.git",
@@
-166,7
+170,8
@@
defmodule Pleroma.Mixfile do
{:captcha,
git: "https://git.pleroma.social/pleroma/elixir-libraries/elixir-captcha.git",
ref: "e0f16822d578866e186a0974d65ad58cddc1e2ab"},
{:captcha,
git: "https://git.pleroma.social/pleroma/elixir-libraries/elixir-captcha.git",
ref: "e0f16822d578866e186a0974d65ad58cddc1e2ab"},
- {:mox, "~> 0.5", only: :test}
+ {:mox, "~> 0.5", only: :test},
+ {:restarter, path: "./restarter"}
] ++ oauth_deps()
end
] ++ oauth_deps()
end