Skip to content

Commit 8bb52ad

Browse files
Merge pull request #12485 from rabbitmq/mergify/bp/v3.13.x/pr-12478
4.0.x: update thoas to 1.2.1 (backport #12478)
2 parents 6fca3b7 + 173a7fb commit 8bb52ad

File tree

3 files changed

+18
-22
lines changed

3 files changed

+18
-22
lines changed

MODULE.bazel

+2-2
Original file line numberDiff line numberDiff line change
@@ -231,8 +231,8 @@ erlang_package.hex_package(
231231
erlang_package.hex_package(
232232
name = "thoas",
233233
build_file = "@rabbitmq-server//bazel:BUILD.thoas",
234-
sha256 = "fc763185b932ecb32a554fb735ee03c3b6b1b31366077a2427d2a97f3bd26735",
235-
version = "1.0.0",
234+
sha256 = "e38697edffd6e91bd12cea41b155115282630075c2a727e7a6b2947f5408b86a",
235+
version = "1.2.1",
236236
)
237237

238238
erlang_package.hex_package(

bazel/BUILD.thoas

+15-19
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,9 @@ erlang_bytecode(
2222
"src/thoas_decode.erl",
2323
"src/thoas_encode.erl",
2424
],
25-
outs = [
26-
"ebin/thoas.beam",
27-
"ebin/thoas_decode.beam",
28-
"ebin/thoas_encode.beam",
29-
],
30-
hdrs = [],
25+
hdrs = [":public_and_private_hdrs"],
3126
app_name = "thoas",
32-
beam = [],
27+
dest = "ebin",
3328
erlc_opts = "//:erlc_opts",
3429
)
3530

@@ -48,20 +43,11 @@ filegroup(
4843
],
4944
)
5045

51-
filegroup(
52-
name = "private_hdrs",
53-
srcs = [],
54-
)
46+
filegroup(name = "private_hdrs")
5547

56-
filegroup(
57-
name = "public_hdrs",
58-
srcs = [],
59-
)
48+
filegroup(name = "public_hdrs")
6049

61-
filegroup(
62-
name = "priv",
63-
srcs = [],
64-
)
50+
filegroup(name = "priv")
6551

6652
filegroup(
6753
name = "licenses",
@@ -87,12 +73,22 @@ filegroup(
8773
erlang_app(
8874
name = "erlang_app",
8975
srcs = [":all_srcs"],
76+
hdrs = [":public_hdrs"],
9077
app_name = "thoas",
9178
beam_files = [":beam_files"],
79+
license_files = [":license_files"],
80+
priv = [":priv"],
9281
)
9382

9483
alias(
9584
name = "thoas",
9685
actual = ":erlang_app",
9786
visibility = ["//visibility:public"],
9887
)
88+
89+
filegroup(
90+
name = "license_files",
91+
srcs = [
92+
"LICENSE",
93+
],
94+
)

rabbitmq-components.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ dep_ra = hex 2.13.5
127127
dep_ranch = hex 2.1.0
128128
dep_recon = hex 2.5.3
129129
dep_redbug = hex 2.0.7
130-
dep_thoas = hex 1.0.0
130+
dep_thoas = hex 1.2.1
131131
dep_observer_cli = hex 1.7.5
132132
dep_seshat = git https://github.com/rabbitmq/seshat v0.6.1
133133
dep_stdout_formatter = hex 0.2.4

0 commit comments

Comments
 (0)