projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'feature/rich-media-cachex' into 'develop'
[akkoma]
/
mix.exs
diff --git
a/mix.exs
b/mix.exs
index 52974c841d21f10e6cc92117ef930abd24838dd8..0b8052d0aa188d43f39cdf5e3603b0dd10251279 100644
(file)
--- a/
mix.exs
+++ b/
mix.exs
@@
-5,7
+5,7
@@
defmodule Pleroma.Mixfile do
[
app: :pleroma,
version: version("0.9.0"),
[
app: :pleroma,
version: version("0.9.0"),
- elixir: "~> 1.
4
",
+ elixir: "~> 1.
7
",
elixirc_paths: elixirc_paths(Mix.env()),
compilers: [:phoenix, :gettext] ++ Mix.compilers(),
elixirc_options: [warnings_as_errors: true],
elixirc_paths: elixirc_paths(Mix.env()),
compilers: [:phoenix, :gettext] ++ Mix.compilers(),
elixirc_options: [warnings_as_errors: true],
@@
-21,8
+21,9
@@
defmodule Pleroma.Mixfile do
homepage_url: "https://pleroma.social/",
docs: [
logo: "priv/static/static/logo.png",
homepage_url: "https://pleroma.social/",
docs: [
logo: "priv/static/static/logo.png",
- extras: ["README.md", "config/config.md"],
- main: "readme"
+ extras: ["README.md", "docs/config.md", "docs/Pleroma-API.md", "docs/Admin-API.md"],
+ main: "readme",
+ output: "priv/static/doc"
]
]
end
]
]
end
@@
-44,7
+45,7
@@
defmodule Pleroma.Mixfile do
defp deps do
[
# Until Phoenix 1.4.1 is released
defp deps do
[
# Until Phoenix 1.4.1 is released
- {:phoenix, github: "
feld
/phoenix", branch: "v1.4"},
+ {:phoenix, github: "
phoenixframework
/phoenix", branch: "v1.4"},
{:plug_cowboy, "~> 1.0"},
{:phoenix_pubsub, "~> 1.1"},
{:phoenix_ecto, "~> 3.3"},
{:plug_cowboy, "~> 1.0"},
{:phoenix_pubsub, "~> 1.1"},
{:phoenix_ecto, "~> 3.3"},
@@
-70,10
+71,12
@@
defmodule Pleroma.Mixfile do
{:crypt,
git: "https://github.com/msantos/crypt", ref: "1f2b58927ab57e72910191a7ebaeff984382a1d3"},
{:cors_plug, "~> 1.5"},
{:crypt,
git: "https://github.com/msantos/crypt", ref: "1f2b58927ab57e72910191a7ebaeff984382a1d3"},
{:cors_plug, "~> 1.5"},
- {:ex_doc, "
> 0.18.3 and < 0.20.0
", only: :dev, runtime: false},
+ {:ex_doc, "
~> 0.19
", only: :dev, runtime: false},
{:web_push_encryption, "~> 0.2.1"},
{:swoosh, "~> 0.20"},
{:web_push_encryption, "~> 0.2.1"},
{:swoosh, "~> 0.20"},
- {:gen_smtp, "~> 0.13"}
+ {:gen_smtp, "~> 0.13"},
+ {:websocket_client, git: "https://github.com/jeremyong/websocket_client.git", only: :test},
+ {:floki, "~> 0.20.0"}
]
end
]
end