X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=mix.exs;h=00733c26a64fe3a085b6f873159a109bd61f1af5;hb=20e6190ead59eb9bd83887b8239cab73c17a961b;hp=f38ce95af6a706220f9e21ea80cfff27240fce84;hpb=a93f3421a704d6728a856d5d82cdbf9c43f3f897;p=akkoma

diff --git a/mix.exs b/mix.exs
index f38ce95af..00733c26a 100644
--- a/mix.exs
+++ b/mix.exs
@@ -17,7 +17,7 @@ defmodule Pleroma.Mixfile do
   # Type `mix help compile.app` for more information.
   def application do
     [mod: {Pleroma.Application, []},
-     extra_applications: [:logger, :runtime_tools]]
+     extra_applications: [:logger, :runtime_tools, :comeonin]]
   end
 
   # Specifies which paths to compile per environment.
@@ -28,12 +28,21 @@ defmodule Pleroma.Mixfile do
   #
   # Type `mix help deps` for examples and options.
   defp deps do
-    [{:phoenix, "~> 1.3.0-rc"},
+    [{:phoenix, "~> 1.3.0"},
      {:phoenix_pubsub, "~> 1.0"},
      {:phoenix_ecto, "~> 3.2"},
      {:postgrex, ">= 0.0.0"},
      {:gettext, "~> 0.11"},
-     {:cowboy, "~> 1.0"}]
+     {:cowboy, "~> 1.0", override: true},
+     {:comeonin, "~> 3.0"},
+     {:trailing_format_plug, "~> 0.0.5" },
+     {:html_sanitize_ex, "~> 1.3.0-rc1"},
+     {:phoenix_html, "~> 2.10"},
+     {:calendar, "~> 0.16.1"},
+     {:cachex, "~> 2.1"},
+     {:httpoison, "~> 0.11.2"},
+     {:ex_machina, "~> 2.0", only: :test},
+     {:credo, "~> 0.7", only: [:dev, :test]}]
   end
 
   # Aliases are shortcuts or tasks specific to the current project.