From a911c27962c8155de2c7232f8751b5b0c20b005b Mon Sep 17 00:00:00 2001
From: William Yang <mscame@gmail.com>
Date: Thu, 16 Jun 2022 10:38:46 +0200
Subject: [PATCH] feat(quic): bump emqtt to 1.6.0 with quic 0.0.11

---
 apps/emqx/rebar.config           | 2 +-
 apps/emqx_connector/rebar.config | 2 +-
 mix.exs                          | 3 +--
 rebar.config                     | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/apps/emqx/rebar.config b/apps/emqx/rebar.config
index 9834563a7..33f30dce0 100644
--- a/apps/emqx/rebar.config
+++ b/apps/emqx/rebar.config
@@ -43,7 +43,7 @@
             {meck, "0.9.2"},
             {proper, "1.4.0"},
             {bbmustache, "1.10.0"},
-            {emqtt, {git, "https://github.com/qzhuyan/emqtt", {branch, "dev/william/bump-quicer"}}}
+            {emqtt, {git, "https://github.com/emqx/emqtt", {tag, "1.6.0"}}}
         ]},
         {extra_src_dirs, [{"test", [recursive]}]}
     ]}
diff --git a/apps/emqx_connector/rebar.config b/apps/emqx_connector/rebar.config
index b114e0884..0ac2d0da8 100644
--- a/apps/emqx_connector/rebar.config
+++ b/apps/emqx_connector/rebar.config
@@ -21,7 +21,7 @@
     %% eredis_cluster's dependency getting resolved earlier.
     %% Here we pin 1.5.2 to avoid surprises in the future.
     {poolboy, {git, "https://github.com/emqx/poolboy.git", {tag, "1.5.2"}}},
-    {emqtt, {git, "https://github.com/qzhuyan/emqtt", {branch, "dev/william/bump-quicer"}}}
+    {emqtt, {git, "https://github.com/emqx/emqtt", {tag, "1.6.0"}}}
 ]}.
 
 {shell, [
diff --git a/mix.exs b/mix.exs
index 372e79d94..939d3f418 100644
--- a/mix.exs
+++ b/mix.exs
@@ -58,8 +58,7 @@ defmodule EMQXUmbrella.MixProject do
       {:ecpool, github: "emqx/ecpool", tag: "0.5.2"},
       {:replayq, "0.3.4", override: true},
       {:pbkdf2, github: "emqx/erlang-pbkdf2", tag: "2.0.4", override: true},
-      # {:emqtt, github: "emqx/emqtt", tag: "1.5.1", override: true},
-      {:emqtt, github: "qzhuyan/emqtt", branch: "dev/william/bump-quicer", override: true},
+      {:emqtt, github: "emqx/emqtt", tag: "1.6.0", override: true},
       {:rulesql, github: "emqx/rulesql", tag: "0.1.4"},
       {:observer_cli, "1.7.1"},
       {:system_monitor, github: "ieQu1/system_monitor", tag: "3.0.3"},
diff --git a/rebar.config b/rebar.config
index 56c427678..1d583a7de 100644
--- a/rebar.config
+++ b/rebar.config
@@ -60,7 +60,7 @@
     , {ecpool, {git, "https://github.com/emqx/ecpool", {tag, "0.5.2"}}}
     , {replayq, "0.3.4"}
     , {pbkdf2, {git, "https://github.com/emqx/erlang-pbkdf2.git", {tag, "2.0.4"}}}
-    , {emqtt, {git, "https://github.com/qzhuyan/emqtt", {branch, "dev/william/bump-quicer"}}}
+    , {emqtt, {git, "https://github.com/emqx/emqtt", {tag, "1.6.0"}}}
     , {rulesql, {git, "https://github.com/emqx/rulesql", {tag, "0.1.4"}}}
     , {observer_cli, "1.7.1"} % NOTE: depends on recon 2.5.x
     , {system_monitor, {git, "https://github.com/ieQu1/system_monitor", {tag, "3.0.3"}}}