Sfoglia il codice sorgente

feat(quic): bump emqtt to 1.6.0 with quic 0.0.11

William Yang 3 anni fa
parent
commit
a911c27962
4 ha cambiato i file con 4 aggiunte e 5 eliminazioni
  1. 1 1
      apps/emqx/rebar.config
  2. 1 1
      apps/emqx_connector/rebar.config
  3. 1 2
      mix.exs
  4. 1 1
      rebar.config

+ 1 - 1
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]}]}
     ]}

+ 1 - 1
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, [

+ 1 - 2
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"},

+ 1 - 1
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"}}}