projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
[akkoma]
/
mix.exs
diff --git
a/mix.exs
b/mix.exs
index 333f21a914d71e24c5c30687aeb258e1324323ab..30931821f13d09404fd07239bb8ce5da381a9b13 100644
(file)
--- a/
mix.exs
+++ b/
mix.exs
@@
-41,7
+41,7
@@
defmodule Pleroma.Mixfile do
def application do
[
mod: {Pleroma.Application, []},
def application do
[
mod: {Pleroma.Application, []},
- extra_applications: [:logger, :runtime_tools, :comeonin],
+ extra_applications: [:logger, :runtime_tools, :comeonin
, :quack
],
included_applications: [:ex_syslogger]
]
end
included_applications: [:ex_syslogger]
]
end
@@
-54,6
+54,12
@@
defmodule Pleroma.Mixfile do
#
# Type `mix help deps` for examples and options.
defp deps do
#
# Type `mix help deps` for examples and options.
defp deps do
+ oauth_strategies = String.split(System.get_env("OAUTH_CONSUMER_STRATEGIES") || "")
+
+ oauth_deps =
+ for s <- oauth_strategies,
+ do: {String.to_atom("ueberauth_#{s}"), ">= 0.0.0"}
+
[
{:phoenix, "~> 1.4.1"},
{:plug_cowboy, "~> 2.0"},
[
{:phoenix, "~> 1.4.1"},
{:plug_cowboy, "~> 2.0"},
@@
-71,6
+77,7
@@
defmodule Pleroma.Mixfile do
{:calendar, "~> 0.17.4"},
{:cachex, "~> 3.0.2"},
{:httpoison, "~> 1.2.0"},
{:calendar, "~> 0.17.4"},
{:cachex, "~> 3.0.2"},
{:httpoison, "~> 1.2.0"},
+ {:poison, "~> 3.0", override: true},
{:tesla, "~> 1.2"},
{:jason, "~> 1.0"},
{:mogrify, "~> 0.6.1"},
{:tesla, "~> 1.2"},
{:jason, "~> 1.0"},
{:mogrify, "~> 0.6.1"},
@@
-91,11
+98,13
@@
defmodule Pleroma.Mixfile do
{:floki, "~> 0.20.0"},
{:ex_syslogger, github: "slashmili/ex_syslogger", tag: "1.4.0"},
{:timex, "~> 3.5"},
{:floki, "~> 0.20.0"},
{:ex_syslogger, github: "slashmili/ex_syslogger", tag: "1.4.0"},
{:timex, "~> 3.5"},
+ {:ueberauth, "~> 0.4"},
{:auto_linker,
git: "https://git.pleroma.social/pleroma/auto_linker.git",
{:auto_linker,
git: "https://git.pleroma.social/pleroma/auto_linker.git",
- ref: "94193ca5f97c1f9fdf3d1469653e2d46fac34bcd"},
- {:pleroma_job_queue, "~> 0.2.0"}
- ]
+ ref: "479dd343f4e563ff91215c8275f3b5c67e032850"},
+ {:pleroma_job_queue, "~> 0.2.0"},
+ {:quack, "~> 0.1.1"}
+ ] ++ oauth_deps
end
# Aliases are shortcuts or tasks specific to the current project.
end
# Aliases are shortcuts or tasks specific to the current project.