X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=mix.exs;h=3e6710bc33bf2f79dcc884b2750b9f5230849970;hb=99ced95d3bf4b49246e6946568cdd31b4173a25f;hp=558e71262fe67fa1a1ccd868399998ae83055055;hpb=1ecdb19de5fa54119c6a744c766bbd6c77d1b746;p=akkoma
diff --git a/mix.exs b/mix.exs
index 558e71262..3e6710bc3 100644
--- a/mix.exs
+++ b/mix.exs
@@ -4,7 +4,7 @@ defmodule Pleroma.Mixfile do
def project do
[
app: :pleroma,
- version: version("2.5.2"),
+ version: version("3.0.0"),
elixir: "~> 1.9",
elixirc_paths: elixirc_paths(Mix.env()),
compilers: [:phoenix, :gettext] ++ Mix.compilers(),
@@ -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
@@ -133,7 +133,7 @@ defmodule Pleroma.Mixfile do
{: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.4", override: true},
{:castore, "~> 0.1"},
@@ -160,8 +160,7 @@ 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"},
@@ -194,16 +193,16 @@ defmodule Pleroma.Mixfile do
ref: "e0f16822d578866e186a0974d65ad58cddc1e2ab"},
{:restarter, path: "./restarter"},
{:majic, "~> 1.0"},
- {:eblurhash, "~> 1.1.0"},
+ {:eblurhash, "~> 1.2.2"},
{:open_api_spex, "~> 3.10"},
- {:elastix, ">= 0.0.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, "~> 1.0.0"},
+ {:elasticsearch,
+ git: "https://akkoma.dev/AkkomaGang/elasticsearch-elixir.git", ref: "main"},
# indirect dependency version override
{:plug, "~> 1.10.4", override: true},
@@ -215,7 +214,6 @@ 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}
] ++ oauth_deps()
@@ -349,6 +347,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")