X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=mix.exs;h=427c5d8103b574555a8843f8dcc5f97ef943aced;hb=3e33479c05c315e04b0947136f1429c79c85c63c;hp=dfb8f6c22f1a56355de7e361b65470e19f68a2f4;hpb=4e4a3e5e13e204344f8c0974166756b9963d1dc0;p=akkoma

diff --git a/mix.exs b/mix.exs
index dfb8f6c22..427c5d810 100644
--- a/mix.exs
+++ b/mix.exs
@@ -30,23 +30,31 @@ defmodule Pleroma.Mixfile do
   # Type `mix help deps` for examples and options.
   defp deps do
     [
-      {:phoenix, "~> 1.3.0"},
-      {:phoenix_pubsub, "~> 1.0"},
-      {:phoenix_ecto, "~> 3.2"},
-      {:postgrex, ">= 0.0.0"},
-      {:gettext, "~> 0.11"},
-      {:cowboy, "~> 1.0", override: true},
-      {:comeonin, "~> 3.0"},
-      {:trailing_format_plug, "~> 0.0.5"},
-      {:html_sanitize_ex, "~> 1.3.0-rc1"},
+      {:phoenix, "~> 1.3.3"},
+      {:phoenix_pubsub, "~> 1.0.2"},
+      {: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"},
+      {:html_sanitize_ex, "~> 1.3.0"},
       {:phoenix_html, "~> 2.10"},
-      {:calendar, "~> 0.16.1"},
-      {:cachex, "~> 2.1"},
-      {:httpoison, "~> 0.11.2"},
+      {:calendar, "~> 0.17.4"},
+      {:cachex, "~> 3.0.2"},
+      {:httpoison, "~> 1.2.0"},
       {:jason, "~> 1.0"},
-      {:ex_machina, "~> 2.0", only: :test},
-      {:credo, "~> 0.7", only: [:dev, :test]},
-      {:mock, "~> 0.3.0", only: :test}
+      {:mogrify, "~> 0.6.1"},
+      {:ex_aws, "~> 2.0"},
+      {:ex_aws_s3, "~> 2.0"},
+      {:earmark, "~> 1.2"},
+      {:ex_machina, "~> 2.2", only: :test},
+      {:credo, "~> 0.9.3", only: [:dev, :test]},
+      {:mock, "~> 0.3.1", only: :test},
+      {:crypt,
+       git: "https://github.com/msantos/crypt", ref: "1f2b58927ab57e72910191a7ebaeff984382a1d3"},
+      {:cors_plug, "~> 1.5"}
     ]
   end