From be411ad3bcc9443f7562273508f9beadd099492b Mon Sep 17 00:00:00 2001
From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
Date: Sat, 3 Sep 2022 04:57:53 +0200
Subject: Test coverage: Switch to covertool to get cobertura output

This allows to have coverage information integrated into Gitlab
---
 mix.exs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'mix.exs')

diff --git a/mix.exs b/mix.exs
index 6e84fe482..77e4c19ad 100644
--- a/mix.exs
+++ b/mix.exs
@@ -13,8 +13,7 @@ defmodule Pleroma.Mixfile do
       start_permanent: Mix.env() == :prod,
       aliases: aliases(),
       deps: deps(),
-      test_coverage: [tool: ExCoveralls],
-      preferred_cli_env: ["coveralls.html": :test],
+      test_coverage: [tool: :covertool, summary: true],
       # Docs
       name: "Pleroma",
       homepage_url: "https://pleroma.social/",
@@ -207,8 +206,7 @@ defmodule Pleroma.Mixfile do
       {:ex_machina, "~> 2.4", only: :test},
       {:credo, "~> 1.4", 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},
+      {:covertool, "~> 2.0", 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}
-- 
cgit v1.2.3


From 6b87b3f2eae62a7d6e20681468c367489a47f0a3 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Fri, 11 Nov 2022 11:39:43 -0500
Subject: Remove Quack logging backend

---
 mix.exs | 2 --
 1 file changed, 2 deletions(-)

(limited to 'mix.exs')

diff --git a/mix.exs b/mix.exs
index 5caa6f484..26a9b2826 100644
--- a/mix.exs
+++ b/mix.exs
@@ -76,7 +76,6 @@ defmodule Pleroma.Mixfile do
         :logger,
         :runtime_tools,
         :comeonin,
-        :quack,
         :fast_sanitize,
         :os_mon,
         :ssl,
@@ -177,7 +176,6 @@ defmodule Pleroma.Mixfile do
        branch: "no-logging"},
       {:prometheus_ecto, "~> 1.4"},
       {:recon, "~> 2.5"},
-      {:quack, "~> 0.1.1"},
       {:joken, "~> 2.0"},
       {:benchee, "~> 1.0"},
       {:pot, "~> 1.0"},
-- 
cgit v1.2.3


From f6d55e1e7774492bb5b86b7d9bbc05ae9475eb4c Mon Sep 17 00:00:00 2001
From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
Date: Sun, 27 Nov 2022 04:05:45 +0100
Subject: Mergeback of release 2.4.5

---
 mix.exs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mix.exs')

diff --git a/mix.exs b/mix.exs
index 26a9b2826..eb635cac9 100644
--- a/mix.exs
+++ b/mix.exs
@@ -4,7 +4,7 @@ defmodule Pleroma.Mixfile do
   def project do
     [
       app: :pleroma,
-      version: version("2.4.53"),
+      version: version("2.4.55"),
       elixir: "~> 1.10",
       elixirc_paths: elixirc_paths(Mix.env()),
       compilers: [:phoenix, :gettext] ++ Mix.compilers(),
-- 
cgit v1.2.3