move curl to bzlmod

Author: keith

modules/opentelemetry-cpp/1.14.2/MODULE.bazel

@@ -12,6 +12,7 @@ single_version_override(
 )
 
 bazel_dep(name = "bazel_skylib", version = "1.5.0")
+bazel_dep(name = "curl", version = "8.4.0")
 bazel_dep(name = "grpc", version = "1.56.3.bcr.1", repo_name = "com_github_grpc_grpc")
 bazel_dep(name = "nlohmann_json", version = "3.11.3", repo_name = "github_nlohmann_json")
 bazel_dep(name = "opentracing-cpp", version = "1.6.0", repo_name = "com_github_opentracing")
@@ -26,8 +27,4 @@ bazel_dep(name = "google_benchmark", version = "1.8.3", dev_dependency = True, r
 bazel_dep(name = "googletest", version = "1.14.0.bcr.1", dev_dependency = True, repo_name = "com_google_googletest")
 
 non_module_deps = use_extension("//bazel:non_module_deps.bzl", "non_module_deps")
-use_repo(
-    non_module_deps,
-    "com_github_opentelemetry_proto",
-    "curl",
-)
+use_repo(non_module_deps, "com_github_opentelemetry_proto")

modules/opentelemetry-cpp/1.14.2/patches/0001-Add-MODULE.bazel.patch

@@ -1,9 +1,6 @@
-diff --git a/MODULE.bazel b/MODULE.bazel
-new file mode 100644
-index 00000000..749eaab9
 --- /dev/null
 +++ b/MODULE.bazel
-@@ -0,0 +1,33 @@
+@@ -0,0 +1,30 @@
 +module(
 +    name = "opentelemetry-cpp",
 +    version = "1.14.2",
@@ -18,6 +15,7 @@ index 00000000..749eaab9
 +)
 +
 +bazel_dep(name = "bazel_skylib", version = "1.5.0")
++bazel_dep(name = "curl", version = "8.4.0")
 +bazel_dep(name = "grpc", version = "1.56.3.bcr.1", repo_name = "com_github_grpc_grpc")
 +bazel_dep(name = "nlohmann_json", version = "3.11.3", repo_name = "github_nlohmann_json")
 +bazel_dep(name = "opentracing-cpp", version = "1.6.0", repo_name = "com_github_opentracing")
@@ -32,17 +30,11 @@ index 00000000..749eaab9
 +bazel_dep(name = "googletest", version = "1.14.0.bcr.1", dev_dependency = True, repo_name = "com_google_googletest")
 +
 +non_module_deps = use_extension("//bazel:non_module_deps.bzl", "non_module_deps")
-+use_repo(
-+    non_module_deps,
-+    "com_github_opentelemetry_proto",
-+    "curl",
-+)
-diff --git a/bazel/non_module_deps.bzl b/bazel/non_module_deps.bzl
-new file mode 100644
-index 00000000..e70d82d3
++use_repo(non_module_deps, "com_github_opentelemetry_proto")
+
 --- /dev/null
 +++ b/bazel/non_module_deps.bzl
-@@ -0,0 +1,27 @@
+@@ -0,0 +1,16 @@
 +"""Load dependencies that aren't supported in bzlmod yet."""
 +
 +load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
@@ -58,15 +50,4 @@ index 00000000..e70d82d3
 +        ],
 +    )
 +
-+    http_archive(
-+        name = "curl",
-+        build_file = "@io_opentelemetry_cpp//bazel:curl.BUILD",
-+        sha256 = "816e41809c043ff285e8c0f06a75a1fa250211bbfb2dc0a037eeef39f1a9e427",
-+        strip_prefix = "curl-8.4.0",
-+        urls = [
-+            "https://curl.haxx.se/download/curl-8.4.0.tar.gz",
-+            "https://github.com/curl/curl/releases/download/curl-8_4_0/curl-8.4.0.tar.gz",
-+        ],
-+    )
-+
 +non_module_deps = module_extension(implementation = _non_module_deps_impl)

modules/opentelemetry-cpp/1.14.2/source.json

@@ -4,6 +4,6 @@
     "url": "https://github.com/open-telemetry/opentelemetry-cpp/archive/refs/tags/v1.14.2.tar.gz",
     "patch_strip": 1,
     "patches": {
-        "0001-Add-MODULE.bazel.patch": "sha256-d/1VjVoP5o4qty3iB5kIdP52QkPquFtUoIB9UJQHu2o="
+        "0001-Add-MODULE.bazel.patch": "sha256-ii7+OaxMYnaGn2Y6El5fHy2OCnKlx6wxn1YGX09/bBU="
     }
 }