X-Git-Url: https://git.squeep.com/?a=blobdiff_plain;ds=sidebyside;f=mix.exs;h=a0eef4f1decc66e0eaa284a79724253dc58bf682;hb=d109bbf71c2781bd0684f98e797f75aa951e67c3;hp=72a6346b579d089551218fda0dfa331d4f7f3a9e;hpb=a010c5b16a395d823a98cd088c83acd098930ade;p=akkoma
diff --git a/mix.exs b/mix.exs
index 72a6346b5..a0eef4f1d 100644
--- a/mix.exs
+++ b/mix.exs
@@ -4,25 +4,23 @@ defmodule Pleroma.Mixfile do
def project do
[
app: :pleroma,
- version: version("2.2.50"),
+ version: version("3.0.0"),
elixir: "~> 1.9",
elixirc_paths: elixirc_paths(Mix.env()),
compilers: [:phoenix, :gettext] ++ Mix.compilers(),
- elixirc_options: [warnings_as_errors: warnings_as_errors(Mix.env())],
- xref: [exclude: [:eldap]],
+ elixirc_options: [warnings_as_errors: warnings_as_errors()],
start_permanent: Mix.env() == :prod,
aliases: aliases(),
deps: deps(),
test_coverage: [tool: ExCoveralls],
preferred_cli_env: ["coveralls.html": :test],
# Docs
- name: "Pleroma",
- homepage_url: "https://pleroma.social/",
- source_url: "https://git.pleroma.social/pleroma/pleroma",
+ name: "Akkoma",
+ homepage_url: "https://akkoma.dev/",
+ source_url: "https://akkoma.dev/AkkomaGang/akkoma",
docs: [
- source_url_pattern:
- "https://git.pleroma.social/pleroma/pleroma/blob/develop/%{path}#L%{line}",
- logo: "priv/static/static/logo.png",
+ source_url_pattern: "https://akkoma.dev/AkkomaGang/akkoma/blob/develop/%{path}#L%{line}",
+ logo: "priv/static/images/logo.png",
extras: ["README.md", "CHANGELOG.md"] ++ Path.wildcard("docs/**/*.md"),
groups_for_extras: [
"Installation manuals": Path.wildcard("docs/installation/*.md"),
@@ -36,9 +34,9 @@ defmodule Pleroma.Mixfile do
releases: [
pleroma: [
include_executables_for: [:unix],
- applications: [ex_syslogger: :load, syslog: :load, eldap: :transient],
+ applications: [ex_syslogger: :load, syslog: :load],
steps: [:assemble, &put_otp_version/1, ©_files/1, ©_nginx_config/1],
- config_providers: [{Pleroma.Config.ReleaseRuntimeProvider, nil}]
+ config_providers: [{Pleroma.Config.ReleaseRuntimeProvider, []}]
]
]
]
@@ -60,8 +58,8 @@ defmodule Pleroma.Mixfile do
def copy_nginx_config(%{path: target_path} = release) do
File.cp!(
- "./installation/pleroma.nginx",
- Path.join([target_path, "installation", "pleroma.nginx"])
+ "./installation/nginx/akkoma.nginx",
+ Path.join([target_path, "installation", "akkoma.nginx"])
)
release
@@ -79,6 +77,7 @@ defmodule Pleroma.Mixfile do
:comeonin,
:quack,
:fast_sanitize,
+ :os_mon,
:ssl
],
included_applications: [:ex_syslogger]
@@ -86,12 +85,11 @@ defmodule Pleroma.Mixfile do
end
# Specifies which paths to compile per environment.
- defp elixirc_paths(:benchmark), do: ["lib", "benchmarks"]
+ defp elixirc_paths(:benchmark), do: ["lib", "benchmarks", "priv/scrubbers"]
defp elixirc_paths(:test), do: ["lib", "test/support"]
defp elixirc_paths(_), do: ["lib"]
- defp warnings_as_errors(:prod), do: false
- defp warnings_as_errors(_), do: true
+ defp warnings_as_errors, do: System.get_env("CI") == "true"
# Specifies OAuth dependencies.
defp oauth_deps do
@@ -115,42 +113,44 @@ defmodule Pleroma.Mixfile do
# Type `mix help deps` for examples and options.
defp deps do
[
- {:phoenix, "~> 1.5.5"},
- {:tzdata, "~> 1.0.3"},
- {:plug_cowboy, "~> 2.3"},
- {:phoenix_pubsub, "~> 2.0"},
- {:phoenix_ecto, "~> 4.0"},
+ {:phoenix, "~> 1.6.11"},
+ {:tzdata, "~> 1.1.1"},
+ {:plug_cowboy, "~> 2.5"},
+ {:phoenix_pubsub, "~> 2.1"},
+ {:phoenix_ecto, "~> 4.4"},
{:ecto_enum, "~> 1.4"},
- {:ecto_sql, "~> 3.4.4"},
- {:postgrex, ">= 0.15.5"},
- {:oban, "~> 2.1.0"},
- {:gettext, "~> 0.18"},
- {:pbkdf2_elixir, "~> 1.2"},
+ {:ecto_sql, "~> 3.8.3"},
+ {:postgrex, ">= 0.16.3"},
+ {:oban, "~> 2.12.1"},
+ {:gettext,
+ git: "https://github.com/tusooa/gettext.git",
+ ref: "72fb2496b6c5280ed911bdc3756890e7f38a4808",
+ override: true},
{:bcrypt_elixir, "~> 2.2"},
{:trailing_format_plug, "~> 0.0.7"},
{:fast_sanitize, "~> 0.2.0"},
{:html_entities, "~> 0.5", override: true},
- {:phoenix_html, "~> 2.14"},
+ {:phoenix_html, "~> 3.1", override: true},
{:calendar, "~> 1.0"},
- {:cachex, "~> 3.2"},
+ {:cachex, "~> 3.4"},
{:poison, "~> 3.0", override: true},
- {:tesla, "~> 1.4.0", override: true},
+ {:tesla, "~> 1.4.4", 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},
+ {:finch, "~> 0.10.0"},
{:jason, "~> 1.2"},
- {:mogrify, "~> 0.7.4"},
+ {:mogrify, "~> 0.9.1"},
{:ex_aws, "~> 2.1.6"},
{:ex_aws_s3, "~> 2.0"},
- {:sweet_xml, "~> 0.6.6"},
- {:earmark, "1.4.3"},
+ {:sweet_xml, "~> 0.7.2"},
+ {:earmark, "~> 1.4.15"},
{:bbcode_pleroma, "~> 0.2.0"},
{:crypt,
git: "https://github.com/msantos/crypt.git",
- ref: "f63a705f92c26955977ee62a313012e309a4d77a"},
+ ref: "f75cd55325e33cbea198fb41fe41871392f8fb76"},
{:cors_plug, "~> 2.0"},
- {:web_push_encryption, "~> 0.3"},
+ {:web_push_encryption, "~> 0.3.1"},
{:swoosh, "~> 1.0"},
{:phoenix_swoosh, "~> 0.3"},
{:gen_smtp, "~> 0.13"},
@@ -158,8 +158,9 @@ defmodule Pleroma.Mixfile do
{:floki, "~> 0.27"},
{:timex, "~> 3.6"},
{:ueberauth, "~> 0.4"},
- {:linkify, "~> 0.4.0"},
- {:http_signatures, "~> 0.1.0"},
+ {:linkify,
+ git: "https://akkoma.dev/AkkomaGang/linkify.git", branch: "bugfix/line-ending-buffer"},
+ {:http_signatures, "~> 0.1.1"},
{:telemetry, "~> 0.3"},
{:poolboy, "~> 1.5"},
{:prometheus, "~> 4.6"},
@@ -178,14 +179,11 @@ defmodule Pleroma.Mixfile do
{:quack, "~> 0.1.1"},
{:joken, "~> 2.0"},
{:benchee, "~> 1.0"},
- {:pot, "~> 0.11"},
- {:esshd, "~> 0.1.0", runtime: Application.get_env(:esshd, :enabled, false)},
+ {:pot, "~> 1.0"},
{:ex_const, "~> 0.2"},
{:plug_static_index_html, "~> 1.0.0"},
{:flake_id, "~> 0.1.0"},
- {:concurrent_limiter,
- git: "https://git.pleroma.social/pleroma/elixir-libraries/concurrent_limiter.git",
- ref: "d81be41024569330f296fc472e24198d7499ba78"},
+ {:concurrent_limiter, "~> 0.1.1"},
{:remote_ip,
git: "https://git.pleroma.social/pleroma/remote_ip.git",
ref: "b647d0deecaa3acb140854fe4bda5b7e1dc6d1c8"},
@@ -193,21 +191,29 @@ defmodule Pleroma.Mixfile do
git: "https://git.pleroma.social/pleroma/elixir-libraries/elixir-captcha.git",
ref: "e0f16822d578866e186a0974d65ad58cddc1e2ab"},
{:restarter, path: "./restarter"},
- {:majic,
- git: "https://git.pleroma.social/pleroma/elixir-libraries/majic.git", branch: "develop"},
- {:open_api_spex,
- git: "https://git.pleroma.social/pleroma/elixir-libraries/open_api_spex.git",
- ref: "f296ac0924ba3cf79c7a588c4c252889df4c2edd"},
+ {:majic, "~> 1.0"},
+ {:eblurhash, "~> 1.2.2"},
+ {:open_api_spex, "3.10.0"},
+ {:search_parser,
+ git: "https://github.com/FloatingGhost/pleroma-contrib-search-parser.git",
+ ref: "08971a81e68686f9ac465cfb6661d51c5e4e1e7f"},
+ {:nimble_parsec, "~> 1.0", override: true},
+ {:phoenix_live_dashboard, "~> 0.6.2"},
+ {:ecto_psql_extras, "~> 0.6"},
+ {:elasticsearch,
+ git: "https://akkoma.dev/AkkomaGang/elasticsearch-elixir.git", ref: "main"},
+
+ # indirect dependency version override
+ {:plug, "~> 1.10.4", override: true},
## dev & test
{:ex_doc, "~> 0.22", only: :dev, runtime: false},
{:ex_machina, "~> 2.4", only: :test},
- {:credo, "~> 1.4", only: [:dev, :test], runtime: false},
+ {:credo, "~> 1.6", only: [:dev, :test], 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, "1.15.2", override: true},
- {:mox, "~> 0.5", only: :test},
+ {:mox, "~> 1.0", only: :test},
{:websocket_client, git: "https://github.com/jeremyong/websocket_client.git", only: :test}
] ++ oauth_deps()
end
@@ -226,7 +232,9 @@ defmodule Pleroma.Mixfile do
"ecto.reset": ["ecto.drop", "ecto.setup"],
test: ["ecto.create --quiet", "ecto.migrate", "test"],
docs: ["pleroma.docs", "docs"],
- analyze: ["credo --strict --only=warnings,todo,fixme,consistency,readability"]
+ analyze: ["credo --strict --only=warnings,todo,fixme,consistency,readability"],
+ copyright: &add_copyright/1,
+ "copyright.bump": &bump_copyright/1
]
end
@@ -241,9 +249,10 @@ defmodule Pleroma.Mixfile do
identifier_filter = ~r/[^0-9a-z\-]+/i
git_available? = match?({_output, 0}, System.cmd("sh", ["-c", "command -v git"]))
+ dotgit_present? = File.exists?(".git")
git_pre_release =
- if git_available? do
+ if git_available? and dotgit_present? do
{tag, tag_err} =
System.cmd("git", ["describe", "--tags", "--abbrev=0"], stderr_to_stdout: true)
@@ -270,6 +279,7 @@ defmodule Pleroma.Mixfile do
# Branch name as pre-release version component, denoted with a dot
branch_name =
with true <- git_available?,
+ true <- dotgit_present?,
{branch_name, 0} <- System.cmd("git", ["rev-parse", "--abbrev-ref", "HEAD"]),
branch_name <- String.trim(branch_name),
branch_name <- System.get_env("PLEROMA_BUILD_BRANCH") || branch_name,
@@ -329,4 +339,33 @@ defmodule Pleroma.Mixfile do
|> Enum.filter(fn string -> string && string != "" end)
|> Enum.join()
end
+
+ defp add_copyright(_) do
+ year = NaiveDateTime.utc_now().year
+ template = ~s[\
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-#{year} Pleroma Authors
+# SPDX-License-Identifier: AGPL-3.0-only
+# Akkoma: The cooler pleroma
+# Copyright © 2022-#{year} Akkoma Authors
+# SPDX-License-Identifier: AGPL-3.0-only
+
+] |> String.replace("\n", "\\n")
+
+ find = "find lib test priv -type f \\( -name '*.ex' -or -name '*.exs' \\) -exec "
+ grep = "grep -L '# Copyright © [0-9\-]* Pleroma' {} \\;"
+ xargs = "xargs -n1 sed -i'' '1s;^;#{template};'"
+
+ :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' \\)"
+
+ xargs =
+ "xargs sed -i'' 's;# Copyright © [0-9\-]* Pleroma.*$;# Copyright © 2017-#{year} Pleroma Authors ;'"
+
+ :os.cmd(String.to_charlist("#{find} | #{xargs}"))
+ end
end