Merge pull request #3403 from rabbitmq/mergify/bp/v3.9.x/pr-3401

HoloRin · web-flow · commit d462822e18fd · 2021-09-10T15:43:45.000+02:00
Use Ranch 2.1.0 in bazel build (backport #3401)
diff --git a/BUILD.ranch b/BUILD.ranch
@@ -32,7 +32,7 @@ genrule(
 app_file(
     name = "app_file",
     app_name = "ranch",
-    app_src = ["src/ranch.app.src"],
+    app_version = "2.1.0",
     modules = [":first_beam_files", ":beam_files"],
 )
 
diff --git a/deps/amqp_client/BUILD.bazel b/deps/amqp_client/BUILD.bazel
@@ -40,7 +40,12 @@ rabbitmq_lib(
     deps = DEPS,
 )
 
-xref(tags = ["xref"])
+xref(
+    additional_libs = [
+        "@ranch//:bazel_erlang_lib",
+    ],
+    tags = ["xref"],
+)
 
 plt(
     name = "base_plt",
diff --git a/deps/rabbit/apps/rabbitmq_prelaunch/BUILD.bazel b/deps/rabbit/apps/rabbitmq_prelaunch/BUILD.bazel
@@ -28,6 +28,7 @@ rabbitmq_lib(
 
 xref(
     additional_libs = [
+        "@ranch//:bazel_erlang_lib",
         "@systemd//:bazel_erlang_lib",
     ],
     tags = ["xref"],
diff --git a/deps/rabbit_common/BUILD.bazel b/deps/rabbit_common/BUILD.bazel
@@ -178,7 +178,12 @@ bazel_erlang_lib(
     deps = DEPS + RUNTIME_DEPS,
 )
 
-xref(tags = ["xref"])
+xref(
+    additional_libs = [
+        "@ranch//:bazel_erlang_lib",
+    ],
+    tags = ["xref"],
+)
 
 plt(
     name = "base_plt",
diff --git a/deps/rabbitmq_aws/BUILD.bazel b/deps/rabbitmq_aws/BUILD.bazel
@@ -38,6 +38,7 @@ xref(
         "//deps/rabbit_common:bazel_erlang_lib",
         "@credentials_obfuscation//:bazel_erlang_lib",
         "@jsx//:bazel_erlang_lib",
+        "@ranch//:bazel_erlang_lib",
         "@recon//:bazel_erlang_lib",
     ],
     tags = ["xref"],
diff --git a/workspace_helpers.bzl b/workspace_helpers.bzl
@@ -228,8 +228,8 @@ erlang_lib(
 
     hex_archive(
         name = "ranch",
-        version = "2.0.0",
-        sha256 = "c20a4840c7d6623c19812d3a7c828b2f1bd153ef0f124cb69c54fe51d8a42ae0",
+        version = "2.1.0",
+        sha256 = "244ee3fa2a6175270d8e1fc59024fd9dbc76294a321057de8f803b1479e76916",
         build_file = rabbitmq_workspace + "//:BUILD.ranch",
     )
 

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ genrule(`
`32`	`32`	`app_file(`
`33`	`33`	`name = "app_file",`
`34`	`34`	`app_name = "ranch",`
`35`		`- app_src = ["src/ranch.app.src"],`
	`35`	`+ app_version = "2.1.0",`
`36`	`36`	`modules = [":first_beam_files", ":beam_files"],`
`37`	`37`	`)`
`38`	`38`
Original file line number	Diff line number	Diff line change
`@@ -228,8 +228,8 @@ erlang_lib(`
`228`	`228`
`229`	`229`	`hex_archive(`
`230`	`230`	`name = "ranch",`
`231`		`- version = "2.0.0",`
`232`		`- sha256 = "c20a4840c7d6623c19812d3a7c828b2f1bd153ef0f124cb69c54fe51d8a42ae0",`
	`231`	`+ version = "2.1.0",`
	`232`	`+ sha256 = "244ee3fa2a6175270d8e1fc59024fd9dbc76294a321057de8f803b1479e76916",`
`233`	`233`	`build_file = rabbitmq_workspace + "//:BUILD.ranch",`
`234`	`234`	`)`
`235`	`235`