From 166455c88441b22455d996ed528ed4804514a3c0 Mon Sep 17 00:00:00 2001
From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
Date: Sat, 15 May 2021 13:08:00 +0200
Subject: mix: Switch hackney & gun to releases

---
 mix.exs | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'mix.exs')

diff --git a/mix.exs b/mix.exs
index a4bacba8e..4ba698620 100644
--- a/mix.exs
+++ b/mix.exs
@@ -137,8 +137,7 @@ defmodule Pleroma.Mixfile do
       {:tesla, "~> 1.4.0", override: true},
       {:castore, "~> 0.1"},
       {:cowlib, "~> 2.9", override: true},
-      {:gun,
-       github: "ninenines/gun", ref: "921c47146b2d9567eac7e9a4d2ccc60fffd4f327", override: true},
+      {:gun, "~> 2.0.0-rc.1", override: true},
       {:jason, "~> 1.2"},
       {:mogrify, "~> 0.7.4"},
       {:ex_aws, "~> 2.1.6"},
@@ -208,10 +207,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,
-       git: "https://git.pleroma.social/pleroma/elixir-libraries/hackney.git",
-       ref: "7d7119f0651515d6d7669c78393fd90950a3ec6e",
-       override: true},
+      {:hackney, "~> 1.17.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 ab32ea44f0af54f9dd87f9a53378b1358f7ac1f8 Mon Sep 17 00:00:00 2001
From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
Date: Sat, 22 May 2021 17:55:40 +0200
Subject: mix.exs: Apply OTP24 fixes to web_push_encryption

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

(limited to 'mix.exs')

diff --git a/mix.exs b/mix.exs
index 4ba698620..7ab8387f9 100644
--- a/mix.exs
+++ b/mix.exs
@@ -149,7 +149,8 @@ defmodule Pleroma.Mixfile do
        git: "https://git.pleroma.social/pleroma/elixir-libraries/crypt.git",
        ref: "cf2aa3f11632e8b0634810a15b3e612c7526f6a3"},
       {:cors_plug, "~> 2.0"},
-      {:web_push_encryption, "~> 0.3"},
+      {:web_push_encryption,
+       git: "https://github.com/lanodan/elixir-web-push-encryption.git", branch: "bugfix/otp-24"},
       {:swoosh, "~> 1.0"},
       {:phoenix_swoosh, "~> 0.3"},
       {:gen_smtp, "~> 0.13"},
-- 
cgit v1.2.3


From 7c5e007b9c73a52a4c46674bd00ce32640c07cc3 Mon Sep 17 00:00:00 2001
From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
Date: Sat, 22 May 2021 18:04:13 +0200
Subject: mix: Update pot to ~> 1.0

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

(limited to 'mix.exs')

diff --git a/mix.exs b/mix.exs
index 7ab8387f9..5d945bf5f 100644
--- a/mix.exs
+++ b/mix.exs
@@ -178,7 +178,7 @@ defmodule Pleroma.Mixfile do
       {:quack, "~> 0.1.1"},
       {:joken, "~> 2.0"},
       {:benchee, "~> 1.0"},
-      {:pot, "~> 0.11"},
+      {: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"},
-- 
cgit v1.2.3