From 8f730f70cb2485383425cdafff5636698fc49d0a Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Sun, 1 Aug 2021 07:57:33 +0200 Subject: mix.exs: 2.4.50 --- mix.exs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mix.exs') diff --git a/mix.exs b/mix.exs index 763c58089..c33beb533 100644 --- a/mix.exs +++ b/mix.exs @@ -4,7 +4,7 @@ defmodule Pleroma.Mixfile do def project do [ app: :pleroma, - version: version("2.4.0"), + version: version("2.4.50"), elixir: "~> 1.9", elixirc_paths: elixirc_paths(Mix.env()), compilers: [:phoenix, :gettext] ++ Mix.compilers(), -- cgit v1.2.3 From 3b20eddcf87ef08ac9ee4ef0db106021c4c1efba Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Tue, 21 Sep 2021 01:16:14 +0200 Subject: mix: Update crypt to fix #pragma warning Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/2710 --- mix.exs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mix.exs') diff --git a/mix.exs b/mix.exs index c33beb533..f10fc89a3 100644 --- a/mix.exs +++ b/mix.exs @@ -145,8 +145,8 @@ defmodule Pleroma.Mixfile do {:earmark, "1.4.15"}, {:bbcode_pleroma, "~> 0.2.0"}, {:crypt, - git: "https://git.pleroma.social/pleroma/elixir-libraries/crypt.git", - ref: "cf2aa3f11632e8b0634810a15b3e612c7526f6a3"}, + git: "https://github.com/msantos/crypt.git", + ref: "031d812ea45593de598bdbc3d28bf45a6e976de3"}, {:cors_plug, "~> 2.0"}, {:web_push_encryption, git: "https://github.com/lanodan/elixir-web-push-encryption.git", branch: "bugfix/otp-24"}, -- cgit v1.2.3 From e4ad4f0bd6bfceb2791e2c23146552aa981e70bd Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Wed, 10 Nov 2021 00:53:32 +0100 Subject: mix: Update http_signatures to 0.1.1 --- mix.exs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mix.exs') diff --git a/mix.exs b/mix.exs index f91e0b007..1998e89fa 100644 --- a/mix.exs +++ b/mix.exs @@ -158,7 +158,7 @@ defmodule Pleroma.Mixfile do {:timex, "~> 3.6"}, {:ueberauth, "~> 0.4"}, {:linkify, "~> 0.5.1"}, - {:http_signatures, "~> 0.1.0"}, + {:http_signatures, "~> 0.1.1"}, {:telemetry, "~> 0.3"}, {:poolboy, "~> 1.5"}, {:prometheus, "~> 4.6"}, -- cgit v1.2.3 From 26450a0be3c17e3869d5c990293368091b5ad3a0 Mon Sep 17 00:00:00 2001 From: Lain Soykaf Date: Sun, 14 Nov 2021 11:43:39 +0100 Subject: Mix: Upgrade mogrify library The old library would modify a file on reading it, the new one doesn't have this issue. --- mix.exs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mix.exs') diff --git a/mix.exs b/mix.exs index f91e0b007..91e70f238 100644 --- a/mix.exs +++ b/mix.exs @@ -138,7 +138,7 @@ defmodule Pleroma.Mixfile do {:cowlib, "~> 2.9", override: true}, {:gun, "~> 2.0.0-rc.1", override: true}, {: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"}, -- cgit v1.2.3 From 7dcc73f2944601df6021b5ea41672f0eda999524 Mon Sep 17 00:00:00 2001 From: Lain Soykaf Date: Sun, 14 Nov 2021 16:04:08 +0100 Subject: Mix: Update crypt to fix musl builds. --- mix.exs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mix.exs') diff --git a/mix.exs b/mix.exs index f91e0b007..3339efe4e 100644 --- a/mix.exs +++ b/mix.exs @@ -146,7 +146,7 @@ defmodule Pleroma.Mixfile do {:bbcode_pleroma, "~> 0.2.0"}, {:crypt, git: "https://github.com/msantos/crypt.git", - ref: "031d812ea45593de598bdbc3d28bf45a6e976de3"}, + ref: "f75cd55325e33cbea198fb41fe41871392f8fb76"}, {:cors_plug, "~> 2.0"}, {:web_push_encryption, git: "https://github.com/lanodan/elixir-web-push-encryption.git", branch: "bugfix/otp-24"}, -- cgit v1.2.3 From 5e15ceb49d9accadce01732fbec7dd4f22ebdfa3 Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Tue, 16 Nov 2021 14:32:49 +0100 Subject: mix: Update earmark This should fix the presence of extraneous newlines in markdown output. Related: https://github.com/pragdave/earmark/issues/406 --- mix.exs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mix.exs') diff --git a/mix.exs b/mix.exs index f91e0b007..a9350789d 100644 --- a/mix.exs +++ b/mix.exs @@ -142,7 +142,7 @@ defmodule Pleroma.Mixfile do {: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, git: "https://github.com/msantos/crypt.git", -- cgit v1.2.3 From 809503011f5cfe23f8e00eb175feba35d50fb3f3 Mon Sep 17 00:00:00 2001 From: a1batross Date: Mon, 29 Nov 2021 17:28:10 +0000 Subject: Mix: upgrade Hackney to 1.18.0 --- mix.exs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mix.exs') diff --git a/mix.exs b/mix.exs index 4ec76a50f..9385f7cf4 100644 --- a/mix.exs +++ b/mix.exs @@ -208,7 +208,7 @@ 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.17.0", override: true}, + {: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() -- cgit v1.2.3 From ce4560c2a1c194f7640accf1205e91bf40779043 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Fri, 3 Dec 2021 16:20:54 -0500 Subject: Fix benchmarks --- mix.exs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mix.exs') diff --git a/mix.exs b/mix.exs index 39c79c83b..c7987005a 100644 --- a/mix.exs +++ b/mix.exs @@ -86,7 +86,7 @@ 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"] -- cgit v1.2.3