yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: fix diverged dependencies

This commit is contained in:
Kjell Winblad 2023-03-02 13:02:11 +01:00
parent 96318bda1d
commit 65f4a6feab
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mix.exs
View File

@ -89,7 +89,8 @@ defmodule EMQXUmbrella.MixProject do
{:ranch, {:ranch,
github: "ninenines/ranch", ref: "a692f44567034dacf5efcaa24a24183788594eb7", override: true}, github: "ninenines/ranch", ref: "a692f44567034dacf5efcaa24a24183788594eb7", override: true},
# in conflict by grpc and eetcd # in conflict by grpc and eetcd
{:gpb, "4.19.5", override: true, runtime: false} {:gpb, "4.19.5", override: true, runtime: false},
{:hackney, github: "benoitc/hackney", tag: "1.18.1", override: true}
] ++ ] ++
umbrella_apps() ++ umbrella_apps() ++
enterprise_apps(profile_info) ++ enterprise_apps(profile_info) ++

1
rebar.config
View File

@ -74,6 +74,7 @@
, {esasl, {git, "https://github.com/emqx/esasl", {tag, "0.2.0"}}} , {esasl, {git, "https://github.com/emqx/esasl", {tag, "0.2.0"}}}
, {jose, {git, "https://github.com/potatosalad/erlang-jose", {tag, "1.11.2"}}} , {jose, {git, "https://github.com/potatosalad/erlang-jose", {tag, "1.11.2"}}}
, {telemetry, "1.1.0"} , {telemetry, "1.1.0"}
, {hackney, {git, "https://github.com/benoitc/hackney", {tag, "1.18.1"}}}
]}. ]}.
{xref_ignores, {xref_ignores,