Skip to content

Commit 0e260cd

Browse files
Merge pull request #9907 from rabbitmq/mergify/bp/v3.11.x/pr-9906
Bump CLI deps, remove dialyxir (backport #9903) (backport #9906)
2 parents 38a9ca4 + c6bfcd8 commit 0e260cd

File tree

7 files changed

+43
-35
lines changed

7 files changed

+43
-35
lines changed

MODULE.bazel

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -214,8 +214,8 @@ erlang_package.hex_package(
214214
erlang_package.hex_package(
215215
name = "csv",
216216
build_file = "@rabbitmq-server//bazel:BUILD.csv",
217-
sha256 = "cbbe5455c93df5f3f2943e995e28b7a8808361ba34cf3e44267d77a01eaf1609",
218-
version = "3.0.5",
217+
sha256 = "f5ee7299a55ff84fbe623d9aea7218b800d19ecccb2b3eac2bcb327d644365ea",
218+
version = "3.2.0",
219219
)
220220

221221
erlang_package.hex_package(
@@ -389,10 +389,10 @@ erlang_dev_package = use_extension(
389389
erlang_dev_package.hex_package(
390390
name = "amqp",
391391
build_file = "@rabbitmq-server//bazel:BUILD.amqp",
392-
sha256 = "b6d926770e4508e30e3e9e476c57b6c8aeda44f7715663bdc38935620ce5be6f",
393-
version = "2.1.1",
394-
patch_args = ["-p1"],
392+
patch_args = ["-p1"],
395393
patches = ["@rabbitmq-server//bazel:amqp.patch"],
394+
sha256 = "8d3ae139d2646c630d674a1b8d68c7f85134f9e8b2a1c3dd5621616994b10a8b",
395+
version = "3.3.0",
396396
)
397397

398398
erlang_dev_package.git_package(
@@ -401,13 +401,6 @@ erlang_dev_package.git_package(
401401
repository = "ninenines/ct_helper",
402402
)
403403

404-
erlang_dev_package.hex_package(
405-
name = "dialyxir",
406-
build_file = "@rabbitmq-server//bazel:BUILD.dialyxir",
407-
sha256 = "6c32a70ed5d452c6650916555b1f96c79af5fc4bf286997f8b15f213de786f73",
408-
version = "0.5.1",
409-
)
410-
411404
erlang_dev_package.git_package(
412405
name = "emqtt",
413406
build_file = "@rabbitmq-server//bazel:BUILD.emqtt",
@@ -444,15 +437,14 @@ erlang_dev_package.hex_package(
444437
erlang_dev_package.hex_package(
445438
name = "x509",
446439
build_file = "@rabbitmq-server//bazel:BUILD.x509",
447-
sha256 = "3604125d6a0171da6e8a935810b58c999fccab0e3d20b2ed28d97fa2d9e2f6b4",
448-
version = "0.8.7",
440+
sha256 = "ccc3bff61406e5bb6a63f06d549f3dba3a1bbb456d84517efaaa210d8a33750f",
441+
version = "0.8.8",
449442
)
450443

451444
use_repo(
452445
erlang_dev_package,
453446
"amqp",
454447
"ct_helper",
455-
"dialyxir",
456448
"emqtt",
457449
"inet_tcp_proxy_dist",
458450
"meck",

bazel/BUILD.amqp

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
load("@rules_erlang//:erlang_bytecode2.bzl", "erlc_opts")
2+
13
filegroup(
24
name = "sources",
35
srcs = [
@@ -8,3 +10,17 @@ filegroup(
810
]),
911
visibility = ["//visibility:public"],
1012
)
13+
14+
erlc_opts(
15+
name = "erlc_opts",
16+
values = select({
17+
"@rules_erlang//:debug_build": [
18+
"+debug_info",
19+
],
20+
"//conditions:default": [
21+
"+debug_info",
22+
"+deterministic",
23+
],
24+
}),
25+
visibility = [":__subpackages__"],
26+
)

bazel/BUILD.dialyxir

Lines changed: 0 additions & 10 deletions
This file was deleted.

bazel/BUILD.x509

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
load("@rules_erlang//:erlang_bytecode2.bzl", "erlc_opts")
2+
13
filegroup(
24
name = "sources",
35
srcs = [
@@ -8,3 +10,17 @@ filegroup(
810
]),
911
visibility = ["//visibility:public"],
1012
)
13+
14+
erlc_opts(
15+
name = "erlc_opts",
16+
values = select({
17+
"@rules_erlang//:debug_build": [
18+
"+debug_info",
19+
],
20+
"//conditions:default": [
21+
"+debug_info",
22+
"+deterministic",
23+
],
24+
}),
25+
visibility = [":__subpackages__"],
26+
)

deps/rabbitmq_cli/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,6 @@ rabbitmqctl_test(
151151
source_deps = {
152152
"@amqp//:sources": "amqp",
153153
"@csv//:sources": "csv",
154-
"@dialyxir//:sources": "dialyxir",
155154
"@json//:sources": "json",
156155
"@temp//:sources": "temp",
157156
"@x509//:sources": "x509",

deps/rabbitmq_cli/Makefile

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,13 @@ PROJECT = rabbitmq_cli
22

33
BUILD_DEPS = rabbit_common
44
DEPS = csv json observer_cli stdout_formatter
5-
TEST_DEPS = amqp amqp_client dialyxir temp x509 rabbit
5+
TEST_DEPS = amqp amqp_client temp x509 rabbit
66

7-
dep_amqp = hex 2.1.1
8-
dep_csv = hex 3.0.5
9-
dep_dialyxir = hex 0.5.1
7+
dep_amqp = hex 3.3.0
8+
dep_csv = hex 3.2.0
109
dep_json = hex 1.4.1
1110
dep_temp = hex 0.4.7
12-
dep_x509 = hex 0.7.0
11+
dep_x509 = hex 0.8.8
1312

1413
DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk
1514
DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk

deps/rabbitmq_cli/mix.exs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -172,10 +172,6 @@ defmodule RabbitMQCtl.MixfileBase do
172172
:amqp,
173173
path: Path.join(deps_dir, "amqp")
174174
},
175-
{
176-
:dialyxir,
177-
path: Path.join(deps_dir, "dialyxir"), runtime: false
178-
},
179175
{
180176
:rabbit,
181177
path: Path.join(deps_dir, "rabbit"),

0 commit comments

Comments
 (0)