Skip to content

Commit c1891b0

Browse files
web-flowmergify[bot]
authored andcommitted
Adopt otp 25.1.2.1
(cherry picked from commit bddabf7) (cherry picked from commit cafdad2) # Conflicts: # MODULE.bazel
1 parent 8ae2728 commit c1891b0

File tree

1 file changed

+12
-4
lines changed

1 file changed

+12
-4
lines changed

MODULE.bazel

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -178,18 +178,26 @@ erlang_package.hex_package(
178178
erlang_package.hex_package(
179179
name = "cowboy",
180180
build_file = "@rabbitmq-server//bazel:BUILD.cowboy",
181+
<<<<<<< HEAD
181182
sha256 = "4643e4fba74ac96d4d152c75803de6fad0b3fa5df354c71afdd6cbeeb15fac8a",
182183
version = "2.8.0",
184+
=======
185+
patch_cmds = [
186+
"rm ebin/cowboy.app",
187+
],
188+
sha256 = "3afdccb7183cc6f143cb14d3cf51fa00e53db9ec80cdcd525482f5e99bc41d6b",
189+
version = "2.10.0",
190+
>>>>>>> cafdad2f76 (Adopt otp 25.1.2.1)
183191
)
184192

185193
erlang_package.hex_package(
186194
name = "cowlib",
187195
build_file = "@rabbitmq-server//bazel:BUILD.cowlib",
188-
sha256 = "163b73f6367a7341b33c794c4e88e7dbfe6498ac42dcd69ef44c5bc5507c8db0",
189-
version = "2.12.1",
190196
patch_cmds = [
191197
"rm ebin/cowlib.app",
192198
],
199+
sha256 = "163b73f6367a7341b33c794c4e88e7dbfe6498ac42dcd69ef44c5bc5507c8db0",
200+
version = "2.12.1",
193201
)
194202

195203
erlang_package.hex_package(
@@ -300,11 +308,11 @@ erlang_package.hex_package(
300308
erlang_package.hex_package(
301309
name = "ranch",
302310
build_file = "@rabbitmq-server//bazel:BUILD.ranch",
303-
sha256 = "244ee3fa2a6175270d8e1fc59024fd9dbc76294a321057de8f803b1479e76916",
304-
version = "2.1.0",
305311
patch_cmds = [
306312
"rm ebin/ranch.app",
307313
],
314+
sha256 = "244ee3fa2a6175270d8e1fc59024fd9dbc76294a321057de8f803b1479e76916",
315+
version = "2.1.0",
308316
)
309317

310318
erlang_package.hex_package(

0 commit comments

Comments
 (0)