Merge pull request #3404 from rabbitmq/mergify/bp/v3.8.x/pr-3403

Use Ranch 2.1.0 in bazel build (backport #3401) (backport #3403)

Author: HoloRin

BUILD.ranch

@@ -0,0 +1,46 @@
+load("@bazel-erlang//:bazel_erlang_lib.bzl", "app_file", "bazel_erlang_lib", "erlc",
+"DEFAULT_ERLC_OPTS")
+
+FIRST_SRCS = [
+    "src/ranch_transport.erl",
+]
+
+erlc(
+    name = "first_beam_files",
+    hdrs = glob(["include/**/*.hrl", "src/**/*.hrl"]),
+    srcs = glob(FIRST_SRCS),
+    erlc_opts = DEFAULT_ERLC_OPTS,
+    dest = "ebin",
+)
+
+erlc(
+    name = "beam_files",
+    hdrs = glob(["include/**/*.hrl", "src/**/*.hrl"]),
+    srcs = glob(["src/**/*.erl"], exclude = FIRST_SRCS),
+    beam = [":first_beam_files"],
+    erlc_opts = DEFAULT_ERLC_OPTS,
+    dest = "ebin",
+)
+
+genrule(
+    name = "appup",
+    srcs = ["src/ranch.appup"],
+    outs = ["ebin/ranch.appup"],
+    cmd = "cp $< $@",
+)
+
+app_file(
+    name = "app_file",
+    app_name = "ranch",
+    app_version = "2.1.0",
+    modules = [":first_beam_files", ":beam_files"],
+)
+
+bazel_erlang_lib(
+    name = "bazel_erlang_lib",
+    app_name = "ranch",
+    app = ":app_file",
+    hdrs = glob(["include/**/*.hrl"]),
+    beam = [":first_beam_files", ":beam_files", ":appup"],
+    visibility = ["//visibility:public"],
+)

deps/amqp_client/BUILD.bazel

@@ -41,7 +41,12 @@ rabbitmq_lib(
     deps = DEPS,
 )
 
-xref(tags = ["xref"])
+xref(
+    additional_libs = [
+        "@ranch//:bazel_erlang_lib",
+    ],
+    tags = ["xref"],
+)
 
 plt(
     name = "base_plt",

deps/rabbit/apps/rabbitmq_prelaunch/BUILD.bazel

@@ -26,6 +26,7 @@ rabbitmq_lib(
 xref(
     additional_libs = [
         "@cuttlefish//:bazel_erlang_lib",
+        "@ranch//:bazel_erlang_lib",
     ],
     tags = ["xref"],
 )

deps/rabbit_common/BUILD.bazel

@@ -180,7 +180,12 @@ bazel_erlang_lib(
     deps = DEPS + RUNTIME_DEPS,
 )
 
-xref(tags = ["xref"])
+xref(
+    additional_libs = [
+        "@ranch//:bazel_erlang_lib",
+    ],
+    tags = ["xref"],
+)
 
 plt(
     name = "base_plt",

deps/rabbitmq_amqp1_0/BUILD.bazel

@@ -50,7 +50,7 @@ xref(
 )
 
 dialyze(
-    size = "small",
+    size = "medium",
     dialyzer_opts = RABBITMQ_DIALYZER_OPTS,
     plt = "//:base_plt",
     tags = ["dialyze"],

deps/rabbitmq_aws/BUILD.bazel

@@ -40,6 +40,7 @@ xref(
         "@credentials_obfuscation//:bazel_erlang_lib",
         "@jsx//:bazel_erlang_lib",
         "@lager//:bazel_erlang_lib",
+        "@ranch//:bazel_erlang_lib",
         "@recon//:bazel_erlang_lib",
     ],
     tags = ["xref"],

workspace_helpers.bzl

@@ -235,13 +235,11 @@ erlang_lib(
         ],
     )
 
-    hex_pm_bazel_erlang_lib(
+    hex_archive(
         name = "ranch",
-        first_srcs = [
-            "src/ranch_transport.erl",
-        ],
-        version = "2.0.0",
-        sha256 = "c20a4840c7d6623c19812d3a7c828b2f1bd153ef0f124cb69c54fe51d8a42ae0",
+        version = "2.1.0",
+        sha256 = "244ee3fa2a6175270d8e1fc59024fd9dbc76294a321057de8f803b1479e76916",
+        build_file = rabbitmq_workspace + "//:BUILD.ranch",
     )
 
     hex_pm_bazel_erlang_lib(