From 19d0872b1a7707b8cfd4ecef2b23d16dd4ced80e Mon Sep 17 00:00:00 2001 From: Patrick Balestra Date: Fri, 13 Jan 2023 00:13:55 +0100 Subject: [PATCH] Add bzlmod support to cc example --- examples/cc/MODULE.bazel | 13 +++++++------ examples/cc/WORKSPACE.bzlmod | 5 ----- examples/cc/external/MODULE.bazel | 5 +++++ 3 files changed, 12 insertions(+), 11 deletions(-) create mode 100644 examples/cc/external/MODULE.bazel diff --git a/examples/cc/MODULE.bazel b/examples/cc/MODULE.bazel index 53df310573..bcb43edaf0 100644 --- a/examples/cc/MODULE.bazel +++ b/examples/cc/MODULE.bazel @@ -1,14 +1,15 @@ bazel_dep(name = "rules_apple", repo_name = "build_bazel_rules_apple", version = "2.0.0") bazel_dep(name = "bazel_skylib", version = "1.3.0") bazel_dep(name = "rules_xcodeproj", repo_name = "com_github_buildbuddy_io_rules_xcodeproj", version = "1.5.0") -# TODO: bump to newest rules_swift containing bzlmod fixes and remove local_path_override -# bazel_dep(name = "rules_swift", repo_name = "build_bazel_rules_swift", version = "1.5.0") -local_path_override( - module_name = "rules_swift", - path = "../../../rules_swift" -) +bazel_dep(name = "rules_swift", repo_name = "build_bazel_rules_swift", version = "1.5.1") +bazel_dep(name = "examples_cc_external", version = "0.0.1") local_path_override( module_name = "rules_xcodeproj", path = "../.." ) + +local_path_override( + module_name = "examples_cc_external", + path = "external" +) diff --git a/examples/cc/WORKSPACE.bzlmod b/examples/cc/WORKSPACE.bzlmod index 0eb4057892..e69de29bb2 100644 --- a/examples/cc/WORKSPACE.bzlmod +++ b/examples/cc/WORKSPACE.bzlmod @@ -1,5 +0,0 @@ - -local_repository( - name = "examples_cc_external", - path = "external", -) diff --git a/examples/cc/external/MODULE.bazel b/examples/cc/external/MODULE.bazel new file mode 100644 index 0000000000..e29bf97f85 --- /dev/null +++ b/examples/cc/external/MODULE.bazel @@ -0,0 +1,5 @@ +module( + name = "examples_cc_external", + version = "0.0.1", + compatibility_level = 1, +)