summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Bakken <luke@bakken.io>2022-01-20 09:53:51 -0800
committerLuke Bakken <luke@bakken.io>2022-01-20 09:53:51 -0800
commit04cb33c022d62dc4991b655978b68b0e54c25aab (patch)
treeac89d1c420cdff8d5dd18fdbe2f5ae16a724a9d9
parent9aa4ed611cb33e810afc12c5160a7258c4473dc0 (diff)
downloadrabbitmq-server-git-gh-4019.tar.gz
Support Elixir 1.13gh-4019
This is the build error prior to these changes: ``` * rabbit_common (/home/bakkenl/development/rabbitmq/rabbitmq-server/deps/rabbit_common) could not find an app file at "_build/dev/lib/rabbit_common/ebin/rabbit_common.app". This may happen if the dependency was not yet compiled or the dependency indeed has no app file (then you can pass app: false as option) ** (Mix) Can't continue due to errors on dependencies ``` Telling `mix` to compile `rabbit_common` ensures that the following links are created: ``` $ ll deps/rabbitmq_cli/_build/dev/lib/rabbit_common/ total 8 drwxr-xr-x 2 bakkenl bakkenl 4096 Jan 20 09:46 . drwxr-xr-x 10 bakkenl bakkenl 4096 Jan 20 09:46 .. lrwxrwxrwx 1 bakkenl bakkenl 33 Jan 20 09:46 ebin -> ../../../../../rabbit_common/ebin lrwxrwxrwx 1 bakkenl bakkenl 36 Jan 20 09:46 include -> ../../../../../rabbit_common/include ```
-rw-r--r--deps/rabbitmq_cli/mix.exs6
-rw-r--r--deps/rabbitmq_ct_client_helpers/rabbitmq-components.mk2
-rw-r--r--deps/rabbitmq_ct_helpers/rabbitmq-components.mk2
-rw-r--r--rabbitmq-components.mk2
4 files changed, 4 insertions, 8 deletions
diff --git a/deps/rabbitmq_cli/mix.exs b/deps/rabbitmq_cli/mix.exs
index 75ff435d4a..40ec5bb6b8 100644
--- a/deps/rabbitmq_cli/mix.exs
+++ b/deps/rabbitmq_cli/mix.exs
@@ -11,7 +11,7 @@ defmodule RabbitMQCtl.MixfileBase do
[
app: :rabbitmqctl,
version: "3.8.0-dev",
- elixir: ">= 1.10.4 and < 1.13.0",
+ elixir: ">= 1.10.4 and < 1.14.0",
build_embedded: Mix.env == :prod,
start_permanent: Mix.env == :prod,
escript: [main_module: RabbitMQCtl,
@@ -149,19 +149,15 @@ defmodule RabbitMQCtl.MixfileBase do
end
end
- # We disable compilation for rabbit_common and amqp_client
- # because Erlang.mk already built them.
[
{
:rabbit_common,
path: Path.join(deps_dir, "rabbit_common"),
- compile: false,
override: true
},
{
:amqp_client,
path: Path.join(deps_dir, "amqp_client"),
- compile: false,
override: true,
only: :test
},
diff --git a/deps/rabbitmq_ct_client_helpers/rabbitmq-components.mk b/deps/rabbitmq_ct_client_helpers/rabbitmq-components.mk
index 32e7862702..c693311c35 100644
--- a/deps/rabbitmq_ct_client_helpers/rabbitmq-components.mk
+++ b/deps/rabbitmq_ct_client_helpers/rabbitmq-components.mk
@@ -119,7 +119,7 @@ dep_lager = hex 3.8.0
dep_prometheus = git https://github.com/deadtrickster/prometheus.erl.git master
dep_ra = git https://github.com/rabbitmq/ra.git main
dep_ranch = hex 1.7.1
-dep_recon = hex 2.5.1
+dep_recon = hex 2.5.2
dep_redbug = hex 2.0.7
dep_observer_cli = hex 1.5.4
dep_stdout_formatter = hex 0.2.4
diff --git a/deps/rabbitmq_ct_helpers/rabbitmq-components.mk b/deps/rabbitmq_ct_helpers/rabbitmq-components.mk
index d8928efdba..1345610907 100644
--- a/deps/rabbitmq_ct_helpers/rabbitmq-components.mk
+++ b/deps/rabbitmq_ct_helpers/rabbitmq-components.mk
@@ -119,7 +119,7 @@ dep_lager = hex 3.8.0
dep_prometheus = git https://github.com/deadtrickster/prometheus.erl.git master
dep_ra = git https://github.com/rabbitmq/ra.git main
dep_ranch = hex 1.7.1
-dep_recon = hex 2.5.1
+dep_recon = hex 2.5.2
dep_redbug = hex 2.0.7
dep_observer_cli = hex 1.5.4
dep_stdout_formatter = hex 0.2.4
diff --git a/rabbitmq-components.mk b/rabbitmq-components.mk
index 484309fa98..acb101c0fe 100644
--- a/rabbitmq-components.mk
+++ b/rabbitmq-components.mk
@@ -118,7 +118,7 @@ dep_looking_glass = git https://github.com/rabbitmq/looking_glass master
dep_prometheus = git https://github.com/deadtrickster/prometheus.erl 06425c21a39c1564164f1cc3fe5bdfa8b23b1f78
dep_ra = git https://github.com/rabbitmq/ra.git main
dep_ranch = hex 2.1.0
-dep_recon = hex 2.5.1
+dep_recon = hex 2.5.2
dep_redbug = hex 2.0.7
dep_observer_cli = hex 1.7.1
dep_stdout_formatter = hex 0.2.4