X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=mix.exs;h=99e30c2a2308900bdf2674bce8bd1927bdfafd5a;hb=2791ce9a1ff2365ac7256f5e1dc2324dee2f82c9;hp=2bd67f2a16b16c0a5a8ca72dd1baca842fec7c05;hpb=0ee51992a89319c3c0d0f7485f1c4e9e2953bc8a;p=akkoma

diff --git a/mix.exs b/mix.exs
index 2bd67f2a1..99e30c2a2 100644
--- a/mix.exs
+++ b/mix.exs
@@ -21,8 +21,9 @@ defmodule Pleroma.Mixfile do
       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"],
+        main: "readme",
+        output: "priv/static/doc"
       ]
     ]
   end
@@ -43,12 +44,13 @@ defmodule Pleroma.Mixfile do
   # Type `mix help deps` for examples and options.
   defp deps do
     [
-      {:phoenix, "~> 1.3.3"},
-      {:phoenix_pubsub, "~> 1.0.2"},
+      # Until Phoenix 1.4.1 is released
+      {:phoenix, github: "phoenixframework/phoenix", branch: "v1.4"},
+      {:plug_cowboy, "~> 1.0"},
+      {:phoenix_pubsub, "~> 1.1"},
       {:phoenix_ecto, "~> 3.3"},
       {:postgrex, ">= 0.13.5"},
       {:gettext, "~> 0.15"},
-      {:cowboy, "~> 1.1.2", override: true},
       {:comeonin, "~> 4.1.1"},
       {:pbkdf2_elixir, "~> 0.12.3"},
       {:trailing_format_plug, "~> 0.0.7"},
@@ -62,7 +64,7 @@ defmodule Pleroma.Mixfile do
       {:mogrify, "~> 0.6.1"},
       {:ex_aws, "~> 2.0"},
       {:ex_aws_s3, "~> 2.0"},
-      {:earmark, "~> 1.2"},
+      {:earmark, "~> 1.3"},
       {:ex_machina, "~> 2.2", only: :test},
       {:credo, "~> 0.9.3", only: [:dev, :test]},
       {:mock, "~> 0.3.1", only: :test},
@@ -72,7 +74,8 @@ defmodule Pleroma.Mixfile do
       {:ex_doc, "> 0.18.3 and < 0.20.0", only: :dev, runtime: false},
       {: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}
     ]
   end