From 3c4430c2521bb1bf844df3147942c4d5a2d898f2 Mon Sep 17 00:00:00 2001 From: x1001100011 Date: Mon, 9 Aug 2021 22:22:50 -0700 Subject: [PATCH] feat: update depends --- apps/emqx_gateway/mix.exs | 2 +- .../lib/emqx_release_helper/dsl/application.ex | 4 +++- mix.exs | 4 +++- mix.lock | 8 ++++---- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/apps/emqx_gateway/mix.exs b/apps/emqx_gateway/mix.exs index a2bbc6f44..846164f38 100644 --- a/apps/emqx_gateway/mix.exs +++ b/apps/emqx_gateway/mix.exs @@ -18,7 +18,7 @@ defmodule EMQXStomp.MixProject do def application do [ - registered: [:], + registered: [], mod: {:emqx_gateway_app, []}, extra_applications: [:logger] ] diff --git a/apps/emqx_release_helper/lib/emqx_release_helper/dsl/application.ex b/apps/emqx_release_helper/lib/emqx_release_helper/dsl/application.ex index 0407555e2..b04882c26 100644 --- a/apps/emqx_release_helper/lib/emqx_release_helper/dsl/application.ex +++ b/apps/emqx_release_helper/lib/emqx_release_helper/dsl/application.ex @@ -131,7 +131,9 @@ defmodule EmqxReleaseHelper.DSL.Application do end end - def application_overlay(%{app_source_path: app_source_path, release_path: release_path} = config) do + def application_overlay( + %{app_source_path: app_source_path, release_path: release_path} = config + ) do "#{app_source_path}/etc" |> File.ls() |> case do diff --git a/mix.exs b/mix.exs index cc8edb34e..ffffdbcdb 100644 --- a/mix.exs +++ b/mix.exs @@ -33,7 +33,9 @@ defmodule EMQXUmbrella.MixProject do {:pbkdf2, github: "emqx/erlang-pbkdf2", tag: "2.0.4", override: true}, {:typerefl, github: "k32/typerefl", tag: "0.6.2", manager: :rebar3, override: true}, {:gen_rpc, github: "emqx/gen_rpc", tag: "2.5.1", override: true}, - {:snabbkaffe, github: "kafka4beam/snabbkaffe", tag: "0.14.0", override: true} + {:gen_coap, github: "emqx/gen_coap", tag: "v0.3.2", override: true}, + {:snabbkaffe, github: "kafka4beam/snabbkaffe", tag: "0.14.0", override: true}, + {:emqx_http_lib, github: "emqx/emqx_http_lib", tag: "0.2.1", override: true} | (enable_bcrypt() && [{:bcrypt, github: "emqx/erlang-bcrypt", tag: "0.6.0"}]) || [] ] end diff --git a/mix.lock b/mix.lock index 3a8d44559..0a09d5466 100644 --- a/mix.lock +++ b/mix.lock @@ -19,19 +19,19 @@ "gproc": {:hex, :gproc, "0.9.0", "853ccb7805e9ada25d227a157ba966f7b34508f386a3e7e21992b1b484230699", [:rebar3], [], "hexpm", "587e8af698ccd3504cf4ba8d90f893ede2b0f58cabb8a916e2bf9321de3cf10b"}, "grpc": {:git, "https://github.com/emqx/grpc-erl.git", "f8ba39eb075fb2a7f370563045d5e5d0914f2703", [tag: "0.6.2"]}, "gun": {:git, "https://github.com/emqx/gun.git", "e1b5e14139e2a936ad6561bf960f70f1e80b81e2", [tag: "1.3.4"]}, - "hocon": {:git, "https://github.com/emqx/hocon.git", "ff4d2205ec8a14f96f30bcee0adaca30d2d487f1", []}, + "hocon": {:git, "https://github.com/emqx/hocon.git", "6eee3287699af968a0fc9966b9c1f114dbeb101d", []}, "jiffy": {:git, "https://github.com/emqx/jiffy.git", "baa1f4e750ae3c5c9e54f9c2e52280b7fc24a8d9", [tag: "1.0.5"]}, - "jose": {:hex, :jose, "1.11.1", "59da64010c69aad6cde2f5b9248b896b84472e99bd18f246085b7b9fe435dcdb", [:mix, :rebar3], [], "hexpm", "078f6c9fb3cd2f4cfafc972c814261a7d1e8d2b3685c0a76eb87e158efff1ac5"}, + "jose": {:hex, :jose, "1.11.2", "f4c018ccf4fdce22c71e44d471f15f723cb3efab5d909ab2ba202b5bf35557b3", [:mix, :rebar3], [], "hexpm", "98143fbc48d55f3a18daba82d34fe48959d44538e9697c08f34200fa5f0947d2"}, "jsx": {:hex, :jsx, "3.1.0", "d12516baa0bb23a59bb35dccaf02a1bd08243fcbb9efe24f2d9d056ccff71268", [:rebar3], [], "hexpm", "0c5cc8fdc11b53cc25cf65ac6705ad39e54ecc56d1c22e4adb8f5a53fb9427f3"}, "luerl": {:git, "https://github.com/rvirding/luerl.git", "fc668ef337b04ca2aee83c648cf6853dab8babe6", []}, - "lwm2m_coap": {:git, "https://github.com/emqx/lwm2m-coap.git", "258e9bd3762124395e83c1e68a1583b84718230f", [tag: "v1.1.2"]}, + "lwm2m_coap": {:git, "https://github.com/emqx/lwm2m-coap.git", "495f3c62fae153040c89f9a0ba5344789ff5acc8", [tag: "v2.0.0"]}, "minirest": {:git, "https://github.com/emqx/minirest.git", "d7a4a8080cae4a9299f221ce16cfb90bd7d80697", [tag: "0.3.5"]}, "mysql": {:git, "https://github.com/emqx/mysql-otp.git", "bdabac44cc8836a9e23897b7e1b77c7df7e04f70", [tag: "1.7.1"]}, "pbkdf2": {:git, "https://github.com/emqx/erlang-pbkdf2.git", "45d9981209ea07a83a58cf85aaf8236457da4342", [tag: "2.0.4"]}, "poolboy": {:git, "https://github.com/emqx/poolboy.git", "29be47db8c2be38b18c908e43a80ebb7b9b6116b", [tag: "1.5.2"]}, "prometheus": {:git, "https://github.com/emqx/prometheus.erl.git", "a41488df09472448057d264ef520cf2f71d925f8", [tag: "v3.1.1"]}, "ranch": {:git, "https://github.com/ninenines/ranch", "3190aef88aea04d6dce8545fe9b4574288903f44", [tag: "1.7.1"]}, - "recon": {:hex, :recon, "2.5.1", "430ffa60685ac1efdfb1fe4c97b8767c92d0d92e6e7c3e8621559ba77598678a", [:mix, :rebar3], [], "hexpm", "5721c6b6d50122d8f68cccac712caa1231f97894bab779eff5ff0f886cb44648"}, + "recon": {:hex, :recon, "2.5.2", "cba53fa8db83ad968c9a652e09c3ed7ddcc4da434f27c3eaa9ca47ffb2b1ff03", [:mix, :rebar3], [], "hexpm", "2c7523c8dee91dff41f6b3d63cba2bd49eb6d2fe5bf1eec0df7f87eb5e230e1c"}, "replayq": {:git, "https://github.com/emqx/replayq", "9e5ba14d65ff1885ad85b6d33a859c01c322f273", [tag: "0.3.1"]}, "snabbkaffe": {:git, "https://github.com/kafka4beam/snabbkaffe.git", "ea1fbffddf8a3b5939bff61cc72ba45c3dceb058", [tag: "0.14.0"]}, "ssl_verify_fun": {:git, "https://github.com/deadtrickster/ssl_verify_fun.erl.git", "c5718226b0b9f3d1a38ef6ca3c3b4c75f53dda92", [tag: "1.1.4"]},