projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'PestToast-develop-patch-66930' into 'develop'
[akkoma]
/
mix.exs
diff --git
a/mix.exs
b/mix.exs
index 5404a5c11fe46a6f14a20f61c643c1e8f73780f4..50d4b408051775caca63eb8eb04e4453b6798549 100644
(file)
--- a/
mix.exs
+++ b/
mix.exs
@@
-123,7
+123,7
@@
defmodule Pleroma.Mixfile do
{:ecto_enum, "~> 1.4"},
{:ecto_sql, "~> 3.4.4"},
{:postgrex, ">= 0.15.5"},
{:ecto_enum, "~> 1.4"},
{: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"},
{:gettext, "~> 0.18"},
{:bcrypt_elixir, "~> 2.2"},
{:trailing_format_plug, "~> 0.0.7"},
@@
-194,7
+194,7
@@
defmodule Pleroma.Mixfile do
{:restarter, path: "./restarter"},
{:majic,
git: "https://git.pleroma.social/pleroma/elixir-libraries/majic.git",
{:restarter, path: "./restarter"},
{:majic,
git: "https://git.pleroma.social/pleroma/elixir-libraries/majic.git",
- ref: "
4c692e544b28d1f5e543fb8a44be090f8cd96f
80"},
+ ref: "
289cda1b6d0d70ccb2ba508a2b0bd24638db28
80"},
{:open_api_spex,
git: "https://git.pleroma.social/pleroma/elixir-libraries/open_api_spex.git",
ref: "f296ac0924ba3cf79c7a588c4c252889df4c2edd"},
{:open_api_spex,
git: "https://git.pleroma.social/pleroma/elixir-libraries/open_api_spex.git",
ref: "f296ac0924ba3cf79c7a588c4c252889df4c2edd"},
@@
-337,26
+337,27
@@
defmodule Pleroma.Mixfile do
defp add_copyright(_) do
year = NaiveDateTime.utc_now().year
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 <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
- line2 = "# Copyright © 2017-#{year} Pleroma Authors <https://pleroma.social/>\\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 "
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};'"
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
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
end
end