X-Git-Url: https://git.squeep.com/?a=blobdiff_plain;ds=inline;f=mix.exs;h=a4bacba8e3dc481bf87d5898ead7ff8df13af914;hb=f2134e605b44c300505f81adab01354a1652b2e5;hp=5404a5c11fe46a6f14a20f61c643c1e8f73780f4;hpb=99c2e8ed5c797078188911d05b693388a88ade3d;p=akkoma
diff --git a/mix.exs b/mix.exs
index 5404a5c11..a4bacba8e 100644
--- a/mix.exs
+++ b/mix.exs
@@ -4,7 +4,7 @@ defmodule Pleroma.Mixfile do
def project do
[
app: :pleroma,
- version: version("2.2.50"),
+ version: version("2.3.50"),
elixir: "~> 1.9",
elixirc_paths: elixirc_paths(Mix.env()),
compilers: [:phoenix, :gettext] ++ Mix.compilers(),
@@ -38,7 +38,7 @@ defmodule Pleroma.Mixfile do
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, []}]
]
]
]
@@ -121,9 +121,10 @@ defmodule Pleroma.Mixfile do
{:phoenix_pubsub, "~> 2.0"},
{:phoenix_ecto, "~> 4.0"},
{:ecto_enum, "~> 1.4"},
+ {:ecto_explain, "~> 0.1.2"},
{:ecto_sql, "~> 3.4.4"},
{: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"},
@@ -143,7 +144,7 @@ defmodule Pleroma.Mixfile do
{: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",
@@ -157,7 +158,7 @@ defmodule Pleroma.Mixfile do
{:floki, "~> 0.27"},
{:timex, "~> 3.6"},
{:ueberauth, "~> 0.4"},
- {:linkify, "~> 0.4.1"},
+ {:linkify, "~> 0.5.0"},
{:http_signatures, "~> 0.1.0"},
{:telemetry, "~> 0.3"},
{:poolboy, "~> 1.5"},
@@ -194,10 +195,11 @@ defmodule Pleroma.Mixfile do
{: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,
+ git: "https://github.com/zotonic/eblurhash.git",
+ ref: "04a0b76eadf4de1be17726f39b6313b88708fd12"},
+ {:open_api_spex, "~> 3.10"},
## dev & test
{:ex_doc, "~> 0.22", only: :dev, runtime: false},
@@ -337,26 +339,27 @@ defmodule Pleroma.Mixfile do
defp add_copyright(_) do
year = NaiveDateTime.utc_now().year
- line1 = "# Pleroma: A lightweight social networking server\\n"
+ template = ~s[\
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-#{year} Pleroma Authors
+# SPDX-License-Identifier: AGPL-3.0-only
- line2 = "# Copyright © 2017-#{year} Pleroma Authors \\n"
-
- 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' {} \\; |"
+ 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 ;'"
- :os.cmd(String.to_charlist("#{find}#{xargs}"))
+ :os.cmd(String.to_charlist("#{find} | #{xargs}"))
end
end