Skip to content

Commit

Permalink
Merge pull request #11103 from savonarola/0620-update-erlcloud
Browse files Browse the repository at this point in the history
chore(deps): update erlcloud and remove unnecessary overrides
  • Loading branch information
savonarola committed Jun 21, 2023
2 parents f50d733 + 54d9648 commit 7382c6e
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 10 deletions.
2 changes: 1 addition & 1 deletion apps/emqx_bridge_dynamo/rebar.config
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
%% -*- mode: erlang; -*-
{erl_opts, [debug_info]}.
{deps, [ {erlcloud, {git, "https://github.com/emqx/erlcloud", {tag, "3.6.8-emqx-1"}}}
{deps, [ {erlcloud, {git, "https://github.com/emqx/erlcloud", {tag, "3.7.0-emqx-1"}}}
, {emqx_connector, {path, "../../apps/emqx_connector"}}
, {emqx_resource, {path, "../../apps/emqx_resource"}}
, {emqx_bridge, {path, "../../apps/emqx_bridge"}}
Expand Down
2 changes: 1 addition & 1 deletion apps/emqx_s3/rebar.config
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{deps, [
{emqx, {path, "../../apps/emqx"}},
{erlcloud, {git, "https://github.com/emqx/erlcloud", {tag, "3.6.8-emqx-1"}}}
{erlcloud, {git, "https://github.com/emqx/erlcloud", {tag, "3.7.0-emqx-1"}}}
]}.

{project_plugins, [erlfmt]}.
1 change: 1 addition & 0 deletions changes/ce/fix-11103.en.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Updated `erlcloud` dependency.
9 changes: 1 addition & 8 deletions mix.exs
Original file line number Diff line number Diff line change
Expand Up @@ -216,14 +216,7 @@ defmodule EMQXUmbrella.MixProject do
github: "emqx/rabbitmq-server",
tag: "v3.11.13-emqx",
sparse: "deps/amqp_client",
override: true},
{:erlcloud, github: "emqx/erlcloud", tag: "3.6.8-emqx-1", override: true},
# erlcloud's rebar.config requires rebar3 and does not support Mix,
# so it tries to fetch deps from git. We need to override this.
{:lhttpc, github: "erlcloud/lhttpc", tag: "1.6.2", override: true},
{:eini, "1.2.9", override: true},
{:base16, "1.0.0", override: true}
# end of erlcloud's deps
override: true}
]
end

Expand Down

0 comments on commit 7382c6e

Please sign in to comment.