X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=mix.exs;h=25711bc26b6bf482d49cc45524c12845d2e3af12;hb=2a96283efbd46c017cf9e15ef4fda3188e5e5bca;hp=0b8052d0aa188d43f39cdf5e3603b0dd10251279;hpb=145d6fe6e9f3c9414b1231da7f200e007413b31b;p=akkoma

diff --git a/mix.exs b/mix.exs
index 0b8052d0a..25711bc26 100644
--- a/mix.exs
+++ b/mix.exs
@@ -21,7 +21,17 @@ defmodule Pleroma.Mixfile do
       homepage_url: "https://pleroma.social/",
       docs: [
         logo: "priv/static/static/logo.png",
-        extras: ["README.md", "docs/config.md", "docs/Pleroma-API.md", "docs/Admin-API.md"],
+        extras: [
+          "README.md",
+          "docs/Admin-API.md",
+          "docs/Clients.md",
+          "docs/config.md",
+          "docs/Custom-Emoji.md",
+          "docs/Differences-in-MastodonAPI-Responses.md",
+          "docs/Message-Rewrite-Facility-configuration.md",
+          "docs/Pleroma-API.md",
+          "docs/static_dir.md"
+        ],
         main: "readme",
         output: "priv/static/doc"
       ]
@@ -32,7 +42,11 @@ defmodule Pleroma.Mixfile do
   #
   # Type `mix help compile.app` for more information.
   def application do
-    [mod: {Pleroma.Application, []}, extra_applications: [:logger, :runtime_tools, :comeonin]]
+    [
+      mod: {Pleroma.Application, []},
+      extra_applications: [:logger, :runtime_tools, :comeonin, :ueberauth_twitter],
+      included_applications: [:ex_syslogger]
+    ]
   end
 
   # Specifies which paths to compile per environment.
@@ -44,9 +58,8 @@ defmodule Pleroma.Mixfile do
   # Type `mix help deps` for examples and options.
   defp deps do
     [
-      # Until Phoenix 1.4.1 is released
-      {:phoenix, github: "phoenixframework/phoenix", branch: "v1.4"},
-      {:plug_cowboy, "~> 1.0"},
+      {:phoenix, "~> 1.4.1"},
+      {:plug_cowboy, "~> 2.0"},
       {:phoenix_pubsub, "~> 1.1"},
       {:phoenix_ecto, "~> 3.3"},
       {:postgrex, ">= 0.13.5"},
@@ -55,17 +68,19 @@ defmodule Pleroma.Mixfile do
       {:pbkdf2_elixir, "~> 0.12.3"},
       {:trailing_format_plug, "~> 0.0.7"},
       {:html_sanitize_ex, "~> 1.3.0"},
+      {:html_entities, "~> 0.4"},
       {:phoenix_html, "~> 2.10"},
       {:calendar, "~> 0.17.4"},
       {:cachex, "~> 3.0.2"},
-      {:httpoison, "~> 1.2.0"},
+      {:httpoison, "~> 1.2.0", override: true},
+      {:poison, "~> 3.0", override: true},
       {:tesla, "~> 1.2"},
       {:jason, "~> 1.0"},
       {:mogrify, "~> 0.6.1"},
       {:ex_aws, "~> 2.0"},
       {:ex_aws_s3, "~> 2.0"},
       {:earmark, "~> 1.3"},
-      {:ex_machina, "~> 2.2", only: :test},
+      {:ex_machina, "~> 2.3", only: :test},
       {:credo, "~> 0.9.3", only: [:dev, :test]},
       {:mock, "~> 0.3.1", only: :test},
       {:crypt,
@@ -76,7 +91,16 @@ defmodule Pleroma.Mixfile do
       {:swoosh, "~> 0.20"},
       {:gen_smtp, "~> 0.13"},
       {:websocket_client, git: "https://github.com/jeremyong/websocket_client.git", only: :test},
-      {:floki, "~> 0.20.0"}
+      {:floki, "~> 0.20.0"},
+      {:ex_syslogger, github: "slashmili/ex_syslogger", tag: "1.4.0"},
+      {:timex, "~> 3.5"},
+      {:oauth, github: "tim/erlang-oauth"},
+      # {:oauth2, "~> 0.8", override: true},
+      {:ueberauth, "~> 0.4"},
+      {:ueberauth_twitter, "~> 0.2"},
+      {:auto_linker,
+       git: "https://git.pleroma.social/pleroma/auto_linker.git",
+       ref: "94193ca5f97c1f9fdf3d1469653e2d46fac34bcd"}
     ]
   end