X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;ds=sidebyside;f=mix.exs;h=99e30c2a2308900bdf2674bce8bd1927bdfafd5a;hb=922abcda61298a7bca48894cb9a51a52fdeab1ed;hp=5b56b94904dd8c1551a2bab4757f6f5c619e65a2;hpb=8cb9580aec10f0f258f4fbd82065d02b0a82b003;p=akkoma

diff --git a/mix.exs b/mix.exs
index 5b56b9490..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"},
@@ -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