Skip to content

Commit ad30e87

Browse files
Merge pull request #9903 from rabbitmq/bump-cli-deps
Bump CLI deps, remove dialyxir
2 parents 09a95a5 + 0f0076a commit ad30e87

File tree

7 files changed

+42
-34
lines changed

7 files changed

+42
-34
lines changed

MODULE.bazel

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -217,8 +217,8 @@ erlang_package.hex_package(
217217
erlang_package.hex_package(
218218
name = "csv",
219219
build_file = "@rabbitmq-server//bazel:BUILD.csv",
220-
sha256 = "cbbe5455c93df5f3f2943e995e28b7a8808361ba34cf3e44267d77a01eaf1609",
221-
version = "3.0.5",
220+
sha256 = "f5ee7299a55ff84fbe623d9aea7218b800d19ecccb2b3eac2bcb327d644365ea",
221+
version = "3.2.0",
222222
)
223223

224224
erlang_package.hex_package(
@@ -435,8 +435,8 @@ erlang_dev_package.hex_package(
435435
build_file = "@rabbitmq-server//bazel:BUILD.amqp",
436436
patch_args = ["-p1"],
437437
patches = ["@rabbitmq-server//bazel:amqp.patch"],
438-
sha256 = "b6d926770e4508e30e3e9e476c57b6c8aeda44f7715663bdc38935620ce5be6f",
439-
version = "2.1.1",
438+
sha256 = "8d3ae139d2646c630d674a1b8d68c7f85134f9e8b2a1c3dd5621616994b10a8b",
439+
version = "3.3.0",
440440
)
441441

442442
erlang_dev_package.git_package(
@@ -445,13 +445,6 @@ erlang_dev_package.git_package(
445445
repository = "ninenines/ct_helper",
446446
)
447447

448-
erlang_dev_package.hex_package(
449-
name = "dialyxir",
450-
build_file = "@rabbitmq-server//bazel:BUILD.dialyxir",
451-
sha256 = "6c32a70ed5d452c6650916555b1f96c79af5fc4bf286997f8b15f213de786f73",
452-
version = "0.5.1",
453-
)
454-
455448
erlang_dev_package.git_package(
456449
name = "emqtt",
457450
branch = "master",
@@ -488,15 +481,14 @@ erlang_dev_package.hex_package(
488481
erlang_dev_package.hex_package(
489482
name = "x509",
490483
build_file = "@rabbitmq-server//bazel:BUILD.x509",
491-
sha256 = "3604125d6a0171da6e8a935810b58c999fccab0e3d20b2ed28d97fa2d9e2f6b4",
492-
version = "0.8.7",
484+
sha256 = "ccc3bff61406e5bb6a63f06d549f3dba3a1bbb456d84517efaaa210d8a33750f",
485+
version = "0.8.8",
493486
)
494487

495488
use_repo(
496489
erlang_dev_package,
497490
"amqp",
498491
"ct_helper",
499-
"dialyxir",
500492
"emqtt",
501493
"inet_tcp_proxy_dist",
502494
"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)