Skip to content

Bump CLI deps, remove dialyxir #9903

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 11, 2023
Merged

Bump CLI deps, remove dialyxir #9903

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1ffae77
Bump CLI deps, remove dialyxir
mkuratczyk Nov 10, 2023
b2c01e3
Remove dialyxir from bazel
mkuratczyk Nov 10, 2023
0f0076a
Run gazelle for updated deps
mkuratczyk Nov 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 6 additions & 14 deletions MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,8 +217,8 @@ erlang_package.hex_package(
erlang_package.hex_package(
name = "csv",
build_file = "@rabbitmq-server//bazel:BUILD.csv",
sha256 = "cbbe5455c93df5f3f2943e995e28b7a8808361ba34cf3e44267d77a01eaf1609",
version = "3.0.5",
sha256 = "f5ee7299a55ff84fbe623d9aea7218b800d19ecccb2b3eac2bcb327d644365ea",
version = "3.2.0",
)

erlang_package.hex_package(
Expand Down Expand Up @@ -435,8 +435,8 @@ erlang_dev_package.hex_package(
build_file = "@rabbitmq-server//bazel:BUILD.amqp",
patch_args = ["-p1"],
patches = ["@rabbitmq-server//bazel:amqp.patch"],
sha256 = "b6d926770e4508e30e3e9e476c57b6c8aeda44f7715663bdc38935620ce5be6f",
version = "2.1.1",
sha256 = "8d3ae139d2646c630d674a1b8d68c7f85134f9e8b2a1c3dd5621616994b10a8b",
version = "3.3.0",
)

erlang_dev_package.git_package(
Expand All @@ -445,13 +445,6 @@ erlang_dev_package.git_package(
repository = "ninenines/ct_helper",
)

erlang_dev_package.hex_package(
name = "dialyxir",
build_file = "@rabbitmq-server//bazel:BUILD.dialyxir",
sha256 = "6c32a70ed5d452c6650916555b1f96c79af5fc4bf286997f8b15f213de786f73",
version = "0.5.1",
)

erlang_dev_package.git_package(
name = "emqtt",
branch = "master",
Expand Down Expand Up @@ -488,15 +481,14 @@ erlang_dev_package.hex_package(
erlang_dev_package.hex_package(
name = "x509",
build_file = "@rabbitmq-server//bazel:BUILD.x509",
sha256 = "3604125d6a0171da6e8a935810b58c999fccab0e3d20b2ed28d97fa2d9e2f6b4",
version = "0.8.7",
sha256 = "ccc3bff61406e5bb6a63f06d549f3dba3a1bbb456d84517efaaa210d8a33750f",
version = "0.8.8",
)

use_repo(
erlang_dev_package,
"amqp",
"ct_helper",
"dialyxir",
"emqtt",
"inet_tcp_proxy_dist",
"meck",
Expand Down
16 changes: 16 additions & 0 deletions bazel/BUILD.amqp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
load("@rules_erlang//:erlang_bytecode2.bzl", "erlc_opts")

filegroup(
name = "sources",
srcs = [
Expand All @@ -8,3 +10,17 @@ filegroup(
]),
visibility = ["//visibility:public"],
)

erlc_opts(
name = "erlc_opts",
values = select({
"@rules_erlang//:debug_build": [
"+debug_info",
],
"//conditions:default": [
"+debug_info",
"+deterministic",
],
}),
visibility = [":__subpackages__"],
)
10 changes: 0 additions & 10 deletions bazel/BUILD.dialyxir
View file
Open in desktop

This file was deleted.

16 changes: 16 additions & 0 deletions bazel/BUILD.x509
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
load("@rules_erlang//:erlang_bytecode2.bzl", "erlc_opts")

filegroup(
name = "sources",
srcs = [
Expand All @@ -8,3 +10,17 @@ filegroup(
]),
visibility = ["//visibility:public"],
)

erlc_opts(
name = "erlc_opts",
values = select({
"@rules_erlang//:debug_build": [
"+debug_info",
],
"//conditions:default": [
"+debug_info",
"+deterministic",
],
}),
visibility = [":__subpackages__"],
)
1 change: 0 additions & 1 deletion deps/rabbitmq_cli/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,6 @@ rabbitmqctl_test(
source_deps = {
"@amqp//:sources": "amqp",
"@csv//:sources": "csv",
"@dialyxir//:sources": "dialyxir",
"@json//:sources": "json",
"@temp//:sources": "temp",
"@x509//:sources": "x509",
Expand Down
9 changes: 4 additions & 5 deletions deps/rabbitmq_cli/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,13 @@ PROJECT = rabbitmq_cli

BUILD_DEPS = rabbit_common
DEPS = csv json observer_cli stdout_formatter
TEST_DEPS = amqp amqp_client dialyxir temp x509 rabbit
TEST_DEPS = amqp amqp_client temp x509 rabbit

dep_amqp = hex 2.1.1
dep_csv = hex 3.0.5
dep_dialyxir = hex 0.5.1
dep_amqp = hex 3.3.0
dep_csv = hex 3.2.0
dep_json = hex 1.4.1
dep_temp = hex 0.4.7
dep_x509 = hex 0.7.0
dep_x509 = hex 0.8.8

DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk
DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk
Expand Down
4 changes: 0 additions & 4 deletions deps/rabbitmq_cli/mix.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,10 +172,6 @@ defmodule RabbitMQCtl.MixfileBase do
:amqp,
path: Path.join(deps_dir, "amqp")
},
{
:dialyxir,
path: Path.join(deps_dir, "dialyxir"), runtime: false
},
{
:rabbit,
path: Path.join(deps_dir, "rabbit"),
Expand Down