def project do
[
app: :pleroma,
- version: version("2.2.50"),
+ version: version("2.4.1"),
elixir: "~> 1.9",
elixirc_paths: elixirc_paths(Mix.env()),
compilers: [:phoenix, :gettext] ++ Mix.compilers(),
include_executables_for: [:unix],
applications: [ex_syslogger: :load, syslog: :load, eldap: :transient],
steps: [:assemble, &put_otp_version/1, ©_files/1, ©_nginx_config/1],
- config_providers: [{Pleroma.Config.ReleaseRuntimeProvider, nil}]
+ config_providers: [{Pleroma.Config.ReleaseRuntimeProvider, []}]
]
]
]
{:phoenix_pubsub, "~> 2.0"},
{:phoenix_ecto, "~> 4.0"},
{:ecto_enum, "~> 1.4"},
- {:ecto_sql, "~> 3.4.4"},
+ {:ecto_sql, "~> 3.6.2"},
{:postgrex, ">= 0.15.5"},
- {:oban, "~> 2.1.0"},
+ {:oban, "~> 2.3.4"},
{:gettext, "~> 0.18"},
{:bcrypt_elixir, "~> 2.2"},
{:trailing_format_plug, "~> 0.0.7"},
{:tesla, "~> 1.4.0", override: true},
{:castore, "~> 0.1"},
{:cowlib, "~> 2.9", override: true},
- {:gun,
- github: "ninenines/gun", ref: "921c47146b2d9567eac7e9a4d2ccc60fffd4f327", override: true},
+ {:gun, "~> 2.0.0-rc.1", override: true},
{:jason, "~> 1.2"},
{:mogrify, "~> 0.7.4"},
{:ex_aws, "~> 2.1.6"},
{:ex_aws_s3, "~> 2.0"},
{:sweet_xml, "~> 0.6.6"},
- {:earmark, "1.4.3"},
+ {:earmark, "1.4.15"},
{:bbcode_pleroma, "~> 0.2.0"},
{:crypt,
git: "https://git.pleroma.social/pleroma/elixir-libraries/crypt.git",
ref: "cf2aa3f11632e8b0634810a15b3e612c7526f6a3"},
{:cors_plug, "~> 2.0"},
- {:web_push_encryption, "~> 0.3"},
+ {:web_push_encryption,
+ git: "https://github.com/lanodan/elixir-web-push-encryption.git", branch: "bugfix/otp-24"},
{:swoosh, "~> 1.0"},
{:phoenix_swoosh, "~> 0.3"},
{:gen_smtp, "~> 0.13"},
{:floki, "~> 0.27"},
{:timex, "~> 3.6"},
{:ueberauth, "~> 0.4"},
- {:linkify, "~> 0.4.1"},
+ {:linkify, "~> 0.5.1"},
{:http_signatures, "~> 0.1.0"},
{:telemetry, "~> 0.3"},
{:poolboy, "~> 1.5"},
{:quack, "~> 0.1.1"},
{:joken, "~> 2.0"},
{:benchee, "~> 1.0"},
- {:pot, "~> 0.11"},
+ {:pot, "~> 1.0"},
{:esshd, "~> 0.1.0", runtime: Application.get_env(:esshd, :enabled, false)},
{:ex_const, "~> 0.2"},
{:plug_static_index_html, "~> 1.0.0"},
{:restarter, path: "./restarter"},
{:majic,
git: "https://git.pleroma.social/pleroma/elixir-libraries/majic.git",
- ref: "4c692e544b28d1f5e543fb8a44be090f8cd96f80"},
- {:open_api_spex,
- git: "https://git.pleroma.social/pleroma/elixir-libraries/open_api_spex.git",
- ref: "f296ac0924ba3cf79c7a588c4c252889df4c2edd"},
+ ref: "289cda1b6d0d70ccb2ba508a2b0bd24638db2880"},
+ {:eblurhash, "~> 1.1.0"},
+ {:open_api_spex, "~> 3.10"},
+
+ # indirect dependency version override
+ {:plug, "~> 1.10.4", override: true},
## dev & test
{:ex_doc, "~> 0.22", only: :dev, runtime: false},
{:mock, "~> 0.3.5", only: :test},
# temporary downgrade for excoveralls, hackney until hackney max_connections bug will be fixed
{:excoveralls, "0.12.3", only: :test},
- {:hackney,
- git: "https://git.pleroma.social/pleroma/elixir-libraries/hackney.git",
- ref: "7d7119f0651515d6d7669c78393fd90950a3ec6e",
- override: true},
+ {:hackney, "~> 1.17.0", override: true},
{:mox, "~> 1.0", only: :test},
{:websocket_client, git: "https://github.com/jeremyong/websocket_client.git", only: :test}
] ++ oauth_deps()
defp add_copyright(_) do
year = NaiveDateTime.utc_now().year
- line1 = "# Pleroma: A lightweight social networking server\\n"
-
- line2 = "# Copyright © 2017-#{year} Pleroma Authors <https://pleroma.social/>\\n"
+ template = ~s[\
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-#{year} Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
- line3 = "# SPDX-License-Identifier: AGPL-3.0-only\\n\\n"
- template = line1 <> line2 <> line3
+] |> String.replace("\n", "\\n")
find = "find lib test priv -type f \\( -name '*.ex' -or -name '*.exs' \\) -exec "
- grep = "grep -L '# Copyright' {} \\; |"
- xargs = "xargs -n1 sed -i '' '1s;^;#{template};'"
+ grep = "grep -L '# Copyright © [0-9\-]* Pleroma' {} \\;"
+ xargs = "xargs -n1 sed -i'' '1s;^;#{template};'"
- :os.cmd(String.to_charlist("#{find}#{grep}#{xargs}"))
+ :os.cmd(String.to_charlist("#{find}#{grep} | #{xargs}"))
end
defp bump_copyright(_) do
year = NaiveDateTime.utc_now().year
- find = "find lib test priv -type f \\( -name '*.ex' -or -name '*.exs' \\) |"
+ find = "find lib test priv -type f \\( -name '*.ex' -or -name '*.exs' \\)"
- xargs = "xargs sed -i '' 's/# Copyright © 2017-20[0-9][0-9]/# Copyright © 2017-#{year}/'"
+ xargs =
+ "xargs sed -i'' 's;# Copyright © [0-9\-]* Pleroma.*$;# Copyright © 2017-#{year} Pleroma Authors <https://pleroma.social/>;'"
- :os.cmd(String.to_charlist("#{find}#{xargs}"))
+ :os.cmd(String.to_charlist("#{find} | #{xargs}"))
end
end