projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bump version, 2.5.1
[akkoma]
/
mix.exs
diff --git
a/mix.exs
b/mix.exs
index bf1e1fdd3b63cd27816de9281bace1fa82b21067..1a201de6c9f1eb9409cdf104d2d06b565d9de1ba 100644
(file)
--- a/
mix.exs
+++ b/
mix.exs
@@
-4,11
+4,11
@@
defmodule Pleroma.Mixfile do
def project do
[
app: :pleroma,
def project do
[
app: :pleroma,
- version: version("2.
4
.1"),
+ version: version("2.
5
.1"),
elixir: "~> 1.9",
elixirc_paths: elixirc_paths(Mix.env()),
compilers: [:phoenix, :gettext] ++ Mix.compilers(),
elixir: "~> 1.9",
elixirc_paths: elixirc_paths(Mix.env()),
compilers: [:phoenix, :gettext] ++ Mix.compilers(),
- elixirc_options: [warnings_as_errors: warnings_as_errors(
Mix.env()
)],
+ elixirc_options: [warnings_as_errors: warnings_as_errors()],
xref: [exclude: [:eldap]],
start_permanent: Mix.env() == :prod,
aliases: aliases(),
xref: [exclude: [:eldap]],
start_permanent: Mix.env() == :prod,
aliases: aliases(),
@@
-16,12
+16,11
@@
defmodule Pleroma.Mixfile do
test_coverage: [tool: ExCoveralls],
preferred_cli_env: ["coveralls.html": :test],
# Docs
test_coverage: [tool: ExCoveralls],
preferred_cli_env: ["coveralls.html": :test],
# Docs
- name: "
Pler
oma",
- homepage_url: "https://
pleroma.social
/",
- source_url: "https://
git.pleroma.social/pleroma/pler
oma",
+ name: "
Akk
oma",
+ homepage_url: "https://
akkoma.dev
/",
+ source_url: "https://
akkoma.dev/AkkomaGang/akk
oma",
docs: [
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: [
logo: "priv/static/images/logo.png",
extras: ["README.md", "CHANGELOG.md"] ++ Path.wildcard("docs/**/*.md"),
groups_for_extras: [
@@
-87,12
+86,11
@@
defmodule Pleroma.Mixfile do
end
# Specifies which paths to compile per environment.
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 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
# Specifies OAuth dependencies.
defp oauth_deps do
@@
-134,23
+132,23
@@
defmodule Pleroma.Mixfile do
{:calendar, "~> 1.0"},
{:cachex, "~> 3.2"},
{:poison, "~> 3.0", override: true},
{:calendar, "~> 1.0"},
{:cachex, "~> 3.2"},
{: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},
{:castore, "~> 0.1"},
{:cowlib, "~> 2.9", override: true},
{:gun, "~> 2.0.0-rc.1", override: true},
+ {:finch, "~> 0.10.0"},
{:jason, "~> 1.2"},
{: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"},
{:ex_aws, "~> 2.1.6"},
{:ex_aws_s3, "~> 2.0"},
{:sweet_xml, "~> 0.6.6"},
- {:earmark, "1.4.15"},
+ {:earmark, "
~>
1.4.15"},
{:bbcode_pleroma, "~> 0.2.0"},
{:crypt,
{:bbcode_pleroma, "~> 0.2.0"},
{:crypt,
- git: "https://git
.pleroma.social/pleroma/elixir-librarie
s/crypt.git",
- ref: "
cf2aa3f11632e8b0634810a15b3e612c7526f6a3
"},
+ git: "https://git
hub.com/msanto
s/crypt.git",
+ ref: "
f75cd55325e33cbea198fb41fe41871392f8fb76
"},
{:cors_plug, "~> 2.0"},
{: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"},
{:phoenix_swoosh, "~> 0.3"},
{:gen_smtp, "~> 0.13"},
{:swoosh, "~> 1.0"},
{:phoenix_swoosh, "~> 0.3"},
{:gen_smtp, "~> 0.13"},
@@
-158,8
+156,10
@@
defmodule Pleroma.Mixfile do
{:floki, "~> 0.27"},
{:timex, "~> 3.6"},
{:ueberauth, "~> 0.4"},
{:floki, "~> 0.27"},
{:timex, "~> 3.6"},
{:ueberauth, "~> 0.4"},
- {:linkify, "~> 0.5.1"},
- {:http_signatures, "~> 0.1.0"},
+ {:linkify,
+ git: "https://git.ihatebeinga.live/floatingghost/linkify.git",
+ branch: "bugfix/line-ending-buffer"},
+ {:http_signatures, "~> 0.1.1"},
{:telemetry, "~> 0.3"},
{:poolboy, "~> 1.5"},
{:prometheus, "~> 4.6"},
{:telemetry, "~> 0.3"},
{:poolboy, "~> 1.5"},
{:prometheus, "~> 4.6"},
@@
-183,9
+183,7
@@
defmodule Pleroma.Mixfile do
{:ex_const, "~> 0.2"},
{:plug_static_index_html, "~> 1.0.0"},
{:flake_id, "~> 0.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"},
{:remote_ip,
git: "https://git.pleroma.social/pleroma/remote_ip.git",
ref: "b647d0deecaa3acb140854fe4bda5b7e1dc6d1c8"},
@@
-193,11
+191,14
@@
defmodule Pleroma.Mixfile do
git: "https://git.pleroma.social/pleroma/elixir-libraries/elixir-captcha.git",
ref: "e0f16822d578866e186a0974d65ad58cddc1e2ab"},
{:restarter, path: "./restarter"},
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",
- ref: "289cda1b6d0d70ccb2ba508a2b0bd24638db2880"},
+ {:majic, "~> 1.0"},
{:eblurhash, "~> 1.1.0"},
{:open_api_spex, "~> 3.10"},
{:eblurhash, "~> 1.1.0"},
{: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"},
{:phoenix_live_dashboard, "~> 0.6.2"},
{:ecto_psql_extras, "~> 0.6"},
@@
-207,11
+208,11
@@
defmodule Pleroma.Mixfile do
## dev & test
{:ex_doc, "~> 0.22", only: :dev, runtime: false},
{:ex_machina, "~> 2.4", only: :test},
## 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},
{: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.1
7
.0", override: true},
+ {:hackney, "~> 1.1
8
.0", override: true},
{:mox, "~> 1.0", only: :test},
{:websocket_client, git: "https://github.com/jeremyong/websocket_client.git", only: :test}
] ++ oauth_deps()
{:mox, "~> 1.0", only: :test},
{:websocket_client, git: "https://github.com/jeremyong/websocket_client.git", only: :test}
] ++ oauth_deps()