Skip to content

Commit

Permalink
Merge pull request #12485 from rabbitmq/mergify/bp/v3.13.x/pr-12478
Browse files Browse the repository at this point in the history
4.0.x: update thoas to 1.2.1 (backport #12478)
  • Loading branch information
michaelklishin authored Oct 8, 2024
2 parents 6fca3b7 + 173a7fb commit 8bb52ad
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 22 deletions.
4 changes: 2 additions & 2 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -231,8 +231,8 @@ erlang_package.hex_package(
erlang_package.hex_package(
name = "thoas",
build_file = "@rabbitmq-server//bazel:BUILD.thoas",
sha256 = "fc763185b932ecb32a554fb735ee03c3b6b1b31366077a2427d2a97f3bd26735",
version = "1.0.0",
sha256 = "e38697edffd6e91bd12cea41b155115282630075c2a727e7a6b2947f5408b86a",
version = "1.2.1",
)

erlang_package.hex_package(
Expand Down
34 changes: 15 additions & 19 deletions bazel/BUILD.thoas
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,9 @@ erlang_bytecode(
"src/thoas_decode.erl",
"src/thoas_encode.erl",
],
outs = [
"ebin/thoas.beam",
"ebin/thoas_decode.beam",
"ebin/thoas_encode.beam",
],
hdrs = [],
hdrs = [":public_and_private_hdrs"],
app_name = "thoas",
beam = [],
dest = "ebin",
erlc_opts = "//:erlc_opts",
)

Expand All @@ -48,20 +43,11 @@ filegroup(
],
)

filegroup(
name = "private_hdrs",
srcs = [],
)
filegroup(name = "private_hdrs")

filegroup(
name = "public_hdrs",
srcs = [],
)
filegroup(name = "public_hdrs")

filegroup(
name = "priv",
srcs = [],
)
filegroup(name = "priv")

filegroup(
name = "licenses",
Expand All @@ -87,12 +73,22 @@ filegroup(
erlang_app(
name = "erlang_app",
srcs = [":all_srcs"],
hdrs = [":public_hdrs"],
app_name = "thoas",
beam_files = [":beam_files"],
license_files = [":license_files"],
priv = [":priv"],
)

alias(
name = "thoas",
actual = ":erlang_app",
visibility = ["//visibility:public"],
)

filegroup(
name = "license_files",
srcs = [
"LICENSE",
],
)
2 changes: 1 addition & 1 deletion rabbitmq-components.mk
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ dep_ra = hex 2.13.5
dep_ranch = hex 2.1.0
dep_recon = hex 2.5.3
dep_redbug = hex 2.0.7
dep_thoas = hex 1.0.0
dep_thoas = hex 1.2.1
dep_observer_cli = hex 1.7.5
dep_seshat = git https://github.com/rabbitmq/seshat v0.6.1
dep_stdout_formatter = hex 0.2.4
Expand Down

0 comments on commit 8bb52ad

Please sign in to comment.