X-Git-Url: https://git.squeep.com/?a=blobdiff_plain;f=mix.exs;h=cb46e8da30f783c581fcb553f2bf3dd1db444e2d;hb=63be819661cd28514207bbc19be6d4964235685b;hp=5529e610368ce1e9980a92b049fc74a107b58a3c;hpb=91ea394cd05783f5a58b37b10de40d31bbc77516;p=akkoma
diff --git a/mix.exs b/mix.exs
index 5529e6103..cb46e8da3 100644
--- a/mix.exs
+++ b/mix.exs
@@ -4,10 +4,10 @@ defmodule Pleroma.Mixfile do
def project do
[
app: :pleroma,
- version: version("2.4.51"),
- elixir: "~> 1.9",
+ version: version("3.5.0"),
+ elixir: "~> 1.12",
elixirc_paths: elixirc_paths(Mix.env()),
- compilers: [:phoenix, :gettext] ++ Mix.compilers(),
+ compilers: [:phoenix] ++ Mix.compilers(),
elixirc_options: [warnings_as_errors: warnings_as_errors()],
xref: [exclude: [:eldap]],
start_permanent: Mix.env() == :prod,
@@ -16,12 +16,11 @@ defmodule Pleroma.Mixfile do
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}",
+ 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: [
@@ -60,8 +59,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
@@ -77,7 +76,6 @@ defmodule Pleroma.Mixfile do
:logger,
:runtime_tools,
:comeonin,
- :quack,
:fast_sanitize,
:os_mon,
:ssl
@@ -96,7 +94,8 @@ defmodule Pleroma.Mixfile do
# Specifies OAuth dependencies.
defp oauth_deps do
oauth_strategy_packages =
- System.get_env("OAUTH_CONSUMER_STRATEGIES")
+ "OAUTH_CONSUMER_STRATEGIES"
+ |> System.get_env()
|> to_string()
|> String.split()
|> Enum.map(fn strategy_entry ->
@@ -115,101 +114,99 @@ 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.15"},
+ {:tzdata, "~> 1.1.1"},
+ {:plug_cowboy, "~> 2.6"},
+ {:phoenix_pubsub, "~> 2.1"},
+ {:phoenix_ecto, "~> 4.4"},
+ {:inet_cidr, "~> 1.0.0"},
{:ecto_enum, "~> 1.4"},
- {:ecto_sql, "~> 3.6.2"},
- {:postgrex, ">= 0.15.5"},
- {:oban, "~> 2.3.4"},
- {:gettext, "~> 0.18"},
+ {:ecto_sql, "~> 3.9.0"},
+ {:postgrex, ">= 0.16.3"},
+ {:oban, "~> 2.12.1"},
+ {:gettext, "~> 0.20.0"},
{:bcrypt_elixir, "~> 2.2"},
- {:trailing_format_plug, "~> 0.0.7"},
- {:fast_sanitize, "~> 0.2.0"},
- {:html_entities, "~> 0.5", override: true},
- {:phoenix_html, "~> 3.1", override: true},
+ {:fast_sanitize, "~> 0.2.3"},
+ {:html_entities, "~> 0.5"},
+ {:phoenix_html, "~> 3.2"},
{:calendar, "~> 1.0"},
- {:cachex, "~> 3.2"},
- {:poison, "~> 3.0", override: true},
- {:tesla, "~> 1.4.0", override: true},
+ {:cachex, "~> 3.4"},
+ {:tesla, "~> 1.4.4"},
{:castore, "~> 0.1"},
- {:cowlib, "~> 2.9", override: true},
- {:gun, "~> 2.0.0-rc.1", override: true},
- {:finch, "~> 0.10.0"},
+ {:cowlib, "~> 2.9"},
+ {:finch, "~> 0.14.0"},
{:jason, "~> 1.2"},
+ {:trailing_format_plug, "~> 0.0.7"},
{:mogrify, "~> 0.9.1"},
{:ex_aws, "~> 2.1.6"},
{:ex_aws_s3, "~> 2.0"},
- {:sweet_xml, "~> 0.6.6"},
+ {:sweet_xml, "~> 0.7.2"},
{:earmark, "~> 1.4.15"},
{:bbcode_pleroma, "~> 0.2.0"},
{:crypt,
git: "https://github.com/msantos/crypt.git",
ref: "f75cd55325e33cbea198fb41fe41871392f8fb76"},
{:cors_plug, "~> 2.0"},
- {:web_push_encryption,
- git: "https://github.com/lanodan/elixir-web-push-encryption.git", branch: "bugfix/otp-24"},
+ {:web_push_encryption, "~> 0.3.1"},
{:swoosh, "~> 1.0"},
+ # for gmail adapter in swoosh
+ {:mail, ">= 0.0.0"},
{:phoenix_swoosh, "~> 0.3"},
{:gen_smtp, "~> 0.13"},
{:ex_syslogger, "~> 1.4"},
{:floki, "~> 0.27"},
{:timex, "~> 3.6"},
{:ueberauth, "~> 0.4"},
- {:linkify, "~> 0.5.1"},
+ {:linkify,
+ git: "https://akkoma.dev/AkkomaGang/linkify.git", branch: "bugfix/line-ending-buffer"},
{:http_signatures, "~> 0.1.1"},
{:telemetry, "~> 0.3"},
+ {:telemetry_poller, "~> 0.4"},
+ {:telemetry_metrics, "~> 0.4"},
+ {:telemetry_metrics_prometheus, "~> 1.1.0"},
{:poolboy, "~> 1.5"},
- {:prometheus, "~> 4.6"},
- {:prometheus_ex,
- git: "https://git.pleroma.social/pleroma/elixir-libraries/prometheus.ex.git",
- ref: "a4e9beb3c1c479d14b352fd9d6dd7b1f6d7deee5",
- override: true},
- {:prometheus_plugs, "~> 1.1"},
- {:prometheus_phoenix, "~> 1.3"},
- # Note: once `prometheus_phx` is integrated into `prometheus_phoenix`, remove the former:
- {:prometheus_phx,
- git: "https://git.pleroma.social/pleroma/elixir-libraries/prometheus-phx.git",
- branch: "no-logging"},
- {:prometheus_ecto, "~> 1.4"},
{:recon, "~> 2.5"},
- {:quack, "~> 0.1.1"},
{:joken, "~> 2.0"},
{:benchee, "~> 1.0"},
{: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"},
{:flake_id, "~> 0.1.0"},
{:concurrent_limiter, "~> 0.1.1"},
- {:remote_ip,
- git: "https://git.pleroma.social/pleroma/remote_ip.git",
- ref: "b647d0deecaa3acb140854fe4bda5b7e1dc6d1c8"},
+ {:remote_ip, "~> 1.1.0"},
{:captcha,
git: "https://git.pleroma.social/pleroma/elixir-libraries/elixir-captcha.git",
ref: "e0f16822d578866e186a0974d65ad58cddc1e2ab"},
{:restarter, path: "./restarter"},
{:majic, "~> 1.0"},
- {:eblurhash, "~> 1.1.0"},
- {:open_api_spex, "~> 3.10"},
+ {:eblurhash, "~> 1.2.2"},
+ {:open_api_spex, "~> 3.16.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"},
-
- # indirect dependency version override
- {:plug, "~> 1.10.4", override: true},
+ {:elasticsearch,
+ git: "https://akkoma.dev/AkkomaGang/elasticsearch-elixir.git", ref: "main"},
+ {:mfm_parser,
+ git: "https://akkoma.dev/AkkomaGang/mfm-parser.git",
+ ref: "912fba81152d4d572e457fd5427f9875b2bc3dbe"},
+ {:poison, ">= 0.0.0"},
## 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,
+ git: "https://github.com/rrrene/credo.git",
+ ref: "1c1b99ea41a457761383d81aaf6a606913996fe7",
+ 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.18.0", override: true},
+ {:excoveralls, "0.15.1", only: :test},
{:mox, "~> 1.0", only: :test},
- {:websocket_client, git: "https://github.com/jeremyong/websocket_client.git", only: :test}
+ {:websockex, "~> 0.4.3", only: :test},
+ {:dialyxir, "~> 1.0", only: [:dev], runtime: false}
] ++ oauth_deps()
end
@@ -244,9 +241,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)
@@ -273,6 +271,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,
@@ -339,6 +338,9 @@ defmodule Pleroma.Mixfile do
# Pleroma: A lightweight social networking server
# Copyright © 2017-#{year} Pleroma Authors
# SPDX-License-Identifier: AGPL-3.0-only
+# Akkoma: Magically expressive social media
+# Copyright © 2022-#{year} Akkoma Authors
+# SPDX-License-Identifier: AGPL-3.0-only
] |> String.replace("\n", "\\n")