X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;ds=inline;f=mix.exs;h=19e6fd045684ab36d7140d5334ba797570472ca1;hb=44da806a77e2076c0c233147d89c4fa1a7046b10;hp=59a538a23b908f8ef69c5d2f4477b9e54554b67b;hpb=8c967311b3ce2ece84bc6c05ec3ef9ed6d7c647e;p=akkoma
diff --git a/mix.exs b/mix.exs
index 59a538a23..19e6fd045 100644
--- a/mix.exs
+++ b/mix.exs
@@ -4,8 +4,8 @@ defmodule Pleroma.Mixfile do
def project do
[
app: :pleroma,
- version: version("2.4.51"),
- elixir: "~> 1.9",
+ version: version("3.2.0"),
+ elixir: "~> 1.12",
elixirc_paths: elixirc_paths(Mix.env()),
compilers: [:phoenix, :gettext] ++ Mix.compilers(),
elixirc_options: [warnings_as_errors: warnings_as_errors()],
@@ -59,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
@@ -114,25 +114,28 @@ 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.6.2"},
- {:postgrex, ">= 0.15.5"},
- {:oban, "~> 2.3.4"},
- {:gettext, "~> 0.18"},
+ {: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"},
+ {:fast_sanitize, "~> 0.2.3"},
{:html_entities, "~> 0.5", override: true},
{: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, "~> 2.0.0-rc.1", override: true},
@@ -141,7 +144,7 @@ defmodule Pleroma.Mixfile do
{: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,
@@ -157,29 +160,15 @@ defmodule Pleroma.Mixfile do
{:timex, "~> 3.6"},
{:ueberauth, "~> 0.4"},
{:linkify,
- git: "https://git.ihatebeinga.live/floatingghost/linkify.git",
- branch: "bugfix/line-ending-buffer"},
+ 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"},
- {: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"},
@@ -192,15 +181,19 @@ defmodule Pleroma.Mixfile do
ref: "e0f16822d578866e186a0974d65ad58cddc1e2ab"},
{:restarter, path: "./restarter"},
{:majic, "~> 1.0"},
- {:eblurhash, "~> 1.1.0"},
- {:open_api_spex, "~> 3.10"},
- {:elastix, ">= 0.0.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"},
+ {:mfm_parser,
+ git: "https://akkoma.dev/AkkomaGang/mfm-parser.git",
+ ref: "912fba81152d4d572e457fd5427f9875b2bc3dbe"},
# indirect dependency version override
{:plug, "~> 1.10.4", override: true},
@@ -212,9 +205,8 @@ defmodule Pleroma.Mixfile do
{: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},
{:mox, "~> 1.0", only: :test},
- {:websocket_client, git: "https://github.com/jeremyong/websocket_client.git", only: :test}
+ {:websockex, "~> 0.4.3", only: :test}
] ++ oauth_deps()
end
@@ -249,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)
@@ -278,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,
@@ -344,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: The cooler pleroma
+# Copyright © 2022-#{year} Akkoma Authors
+# SPDX-License-Identifier: AGPL-3.0-only
] |> String.replace("\n", "\\n")