projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Conversations: Add a function to 'import' old DMs.
[akkoma]
/
mix.exs
diff --git
a/mix.exs
b/mix.exs
index 8cb389248f3353e623bbcff4f1daeabddf2bc246..fae21f18d5323f145f878350120e5d6e46855191 100644
(file)
--- a/
mix.exs
+++ b/
mix.exs
@@
-16,13
+16,13
@@
defmodule Pleroma.Mixfile do
# Docs
name: "Pleroma",
# Docs
name: "Pleroma",
- source_url: "https://git.pleroma.social/pleroma/pleroma",
- source_url_pattern:
- "https://git.pleroma.social/pleroma/pleroma/blob/develop/%{path}#L%{line}",
homepage_url: "https://pleroma.social/",
homepage_url: "https://pleroma.social/",
+ source_url: "https://git.pleroma.social/pleroma/pleroma",
docs: [
docs: [
+ source_url_pattern:
+ "https://git.pleroma.social/pleroma/pleroma/blob/develop/%{path}#L%{line}",
logo: "priv/static/static/logo.png",
logo: "priv/static/static/logo.png",
- extras: ["README.md"
| Path.wildcard("docs/**/*.md")]
,
+ extras: ["README.md"
, "CHANGELOG.md"] ++ Path.wildcard("docs/**/*.md")
,
groups_for_extras: [
"Installation manuals": Path.wildcard("docs/installation/*.md"),
Configuration: Path.wildcard("docs/config/*.md"),
groups_for_extras: [
"Installation manuals": Path.wildcard("docs/installation/*.md"),
Configuration: Path.wildcard("docs/config/*.md"),
@@
-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
, :esshd, :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,19
+77,21
@@
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"},
{:ex_aws, "~> 2.0"},
{:ex_aws_s3, "~> 2.0"},
{:earmark, "~> 1.3"},
{:tesla, "~> 1.2"},
{:jason, "~> 1.0"},
{:mogrify, "~> 0.6.1"},
{:ex_aws, "~> 2.0"},
{:ex_aws_s3, "~> 2.0"},
{:earmark, "~> 1.3"},
+ {:bbcode, "~> 0.1"},
{:ex_machina, "~> 2.3", only: :test},
{:credo, "~> 0.9.3", only: [:dev, :test]},
{:ex_machina, "~> 2.3", only: :test},
{:credo, "~> 0.9.3", only: [:dev, :test]},
- {:mock, "~> 0.3.
1
", only: :test},
+ {:mock, "~> 0.3.
3
", only: :test},
{:crypt,
git: "https://github.com/msantos/crypt", ref: "1f2b58927ab57e72910191a7ebaeff984382a1d3"},
{:cors_plug, "~> 1.5"},
{:crypt,
git: "https://github.com/msantos/crypt", ref: "1f2b58927ab57e72910191a7ebaeff984382a1d3"},
{:cors_plug, "~> 1.5"},
- {:ex_doc, "~> 0.
19
", only: :dev, runtime: false},
+ {:ex_doc, "~> 0.
20.2
", only: :dev, runtime: false},
{:web_push_encryption, "~> 0.2.1"},
{:swoosh, "~> 0.20"},
{:gen_smtp, "~> 0.13"},
{:web_push_encryption, "~> 0.2.1"},
{:swoosh, "~> 0.20"},
{:gen_smtp, "~> 0.13"},
@@
-91,9
+99,10
@@
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: "
479dd343f4e563ff91215c8275f3b5c67e032850
"},
+ ref: "
c00c4e75b35367fa42c95ffd9b8c455bf9995829
"},
{:pleroma_job_queue, "~> 0.2.0"},
{:telemetry, "~> 0.3"},
{:prometheus_ex, "~> 3.0"},
{:pleroma_job_queue, "~> 0.2.0"},
{:telemetry, "~> 0.3"},
{:prometheus_ex, "~> 3.0"},
@@
-101,8
+110,11
@@
defmodule Pleroma.Mixfile do
{:prometheus_phoenix, "~> 1.2"},
{:prometheus_ecto, "~> 1.4"},
{:prometheus_process_collector, "~> 1.4"},
{:prometheus_phoenix, "~> 1.2"},
{:prometheus_ecto, "~> 1.4"},
{:prometheus_process_collector, "~> 1.4"},
- {:recon, github: "ferd/recon"}
- ]
+ {:recon, github: "ferd/recon", tag: "2.4.0"},
+ {:quack, "~> 0.1.1"},
+ {:benchee, "~> 1.0"},
+ {:esshd, "~> 0.1.0"}
+ ] ++ oauth_deps
end
# Aliases are shortcuts or tasks specific to the current project.
end
# Aliases are shortcuts or tasks specific to the current project.