Skip to content

Commit c91bfd1

Browse files
cgrindelcgrindel
committed
http_archive_ext_deps builds, but Gazelle plugin does not work.
1 parent c23dae5 commit c91bfd1

File tree

5 files changed

+50
-109
lines changed

5 files changed

+50
-109
lines changed

‎examples/example_infos.bzl

+1-5
Original file line numberDiff line numberDiff line change
@@ -122,11 +122,7 @@ _timeouts = {
122122

123123
_default_enable_bzlmods = [True]
124124

125-
_enable_bzlmods = {
126-
# GH411: Enable bzlmod for http_archive_ext_deps.
127-
"http_archive_ext_deps": [False],
128-
"vapor_example": [True, False],
129-
}
125+
_enable_bzlmods = {}
130126

131127
_all_os_all_bazel_versions_test_examples = [
132128
"http_archive_ext_deps",

‎examples/http_archive_ext_deps/.bazelrc

-4
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,3 @@ import %workspace%/../../ci.bazelrc
66

77
# Try to import a local.rc file; typically, written by CI
88
try-import %workspace%/../../local.bazelrc
9-
10-
# GH411: Disable bzlmod for http_archive_ext_deps example.
11-
common --noenable_bzlmod
12-
build --no@cgrindel_bazel_starlib//bzlmod:enabled

‎examples/http_archive_ext_deps/MODULE.bazel

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ bazel_dep(
1414
version = "1.18.0",
1515
repo_name = "build_bazel_rules_swift",
1616
)
17+
bazel_dep(name = "apple_support", version = "1.15.1")
1718

1819
bazel_dep(
1920
name = "bazel_skylib_gazelle_plugin",

‎examples/http_archive_ext_deps/WORKSPACE

+1-100
Original file line numberDiff line numberDiff line change
@@ -1,100 +1 @@
1-
workspace(name = "simple_example")
2-
3-
local_repository(
4-
name = "rules_swift_package_manager",
5-
path = "../..",
6-
)
7-
8-
load("@rules_swift_package_manager//:deps.bzl", "swift_bazel_dependencies")
9-
10-
swift_bazel_dependencies()
11-
12-
load("@cgrindel_bazel_starlib//:deps.bzl", "bazel_starlib_dependencies")
13-
14-
bazel_starlib_dependencies()
15-
16-
# MARK: - Gazelle
17-
18-
# gazelle:repo bazel_gazelle
19-
20-
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
21-
22-
http_archive(
23-
name = "bazel_skylib_gazelle_plugin",
24-
sha256 = "47337121076d4fc9c82079cde046431f7b1d2dd18df9c46b674522a9202d335e",
25-
urls = [
26-
"https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.6.1/bazel-skylib-gazelle-plugin-1.6.1.tar.gz",
27-
"https://github.com/bazelbuild/bazel-skylib/releases/download/1.6.1/bazel-skylib-gazelle-plugin-1.6.1.tar.gz",
28-
],
29-
)
30-
31-
load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies")
32-
load("@bazel_skylib_gazelle_plugin//:workspace.bzl", "bazel_skylib_gazelle_plugin_workspace")
33-
load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies")
34-
load("@rules_swift_package_manager//:go_deps.bzl", "swift_bazel_go_dependencies")
35-
36-
# Declare Go dependencies before calling go_rules_dependencies.
37-
swift_bazel_go_dependencies()
38-
39-
bazel_skylib_gazelle_plugin_workspace()
40-
41-
go_rules_dependencies()
42-
43-
go_register_toolchains(version = "1.21.1")
44-
45-
gazelle_dependencies()
46-
47-
# MARK: - Swift Toolchain
48-
49-
http_archive(
50-
name = "build_bazel_rules_swift",
51-
sha256 = "bb01097c7c7a1407f8ad49a1a0b1960655cf823c26ad2782d0b7d15b323838e2",
52-
url = "https://github.com/bazelbuild/rules_swift/releases/download/1.18.0/rules_swift.1.18.0.tar.gz",
53-
)
54-
55-
load(
56-
"@build_bazel_rules_swift//swift:repositories.bzl",
57-
"swift_rules_dependencies",
58-
)
59-
60-
swift_rules_dependencies()
61-
62-
load(
63-
"@build_bazel_rules_swift//swift:extras.bzl",
64-
"swift_rules_extra_dependencies",
65-
)
66-
67-
swift_rules_extra_dependencies()
68-
69-
# MARK: - Swift Dependencies
70-
71-
# Example of defining Swift targets in a separate build file
72-
http_archive(
73-
name = "com_github_apple_swift_collections",
74-
build_file = "@//third_party:swift_collections.BUILD.bazel",
75-
sha256 = "59ca5676b2662021f3046becb7824747c002637677b953fc059ee555f1e0b438",
76-
strip_prefix = "swift-collections-1.1.0",
77-
url = "https://github.com/apple/swift-collections/archive/refs/tags/1.1.0.tar.gz",
78-
)
79-
80-
# Example of defining Swift targets inline.
81-
http_archive(
82-
name = "com_github_apple_swift_argument_parser",
83-
build_file_content = """\
84-
load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
85-
swift_library(
86-
name = "ArgumentParser",
87-
srcs = glob(["Sources/ArgumentParser/**/*.swift"]),
88-
visibility = ["//visibility:public"],
89-
deps = [":ArgumentParserToolInfo"],
90-
)
91-
swift_library(
92-
name = "ArgumentParserToolInfo",
93-
srcs = glob(["Sources/ArgumentParserToolInfo/**/*.swift"]),
94-
visibility = ["//visibility:public"],
95-
)
96-
""",
97-
sha256 = "d5bad3a1da66d9f4ceb0a347a197b8fdd243a91ff6b2d72b78efb052b9d6dd33",
98-
strip_prefix = "swift-argument-parser-1.4.0",
99-
url = "https://github.com/apple/swift-argument-parser/archive/1.4.0.tar.gz",
100-
)
1+
# Intentionally blank

‎examples/http_archive_ext_deps/third_party/swift_collections.BUILD.bazel

+47
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,63 @@ swift_library(
66
name = "Collections",
77
srcs = glob(["Sources/Collections/**/*.swift"]),
88
visibility = ["//visibility:public"],
9+
deps = [
10+
":BitCollections",
11+
":DequeModule",
12+
":HashTreeCollections",
13+
":HeapModule",
14+
":OrderedCollections",
15+
"_RopeModule",
16+
],
17+
)
18+
19+
swift_library(
20+
name = "BitCollections",
21+
srcs = glob(["Sources/BitCollections/**/*.swift"]),
22+
visibility = ["//visibility:public"],
23+
deps = [
24+
":_CollectionsUtilities",
25+
],
926
)
1027

1128
swift_library(
1229
name = "DequeModule",
1330
srcs = glob(["Sources/DequeModule/**/*.swift"]),
1431
visibility = ["//visibility:public"],
32+
deps = [
33+
":_CollectionsUtilities",
34+
],
35+
)
36+
37+
swift_library(
38+
name = "HashTreeCollections",
39+
srcs = glob(["Sources/HashTreeCollections/**/*.swift"]),
40+
visibility = ["//visibility:public"],
41+
deps = [
42+
":_CollectionsUtilities",
43+
],
44+
)
45+
46+
swift_library(
47+
name = "HeapModule",
48+
srcs = glob(["Sources/HeapModule/**/*.swift"]),
49+
visibility = ["//visibility:public"],
50+
deps = [
51+
":_CollectionsUtilities",
52+
],
1553
)
1654

1755
swift_library(
1856
name = "OrderedCollections",
1957
srcs = glob(["Sources/OrderedCollections/**/*.swift"]),
2058
visibility = ["//visibility:public"],
59+
deps = [
60+
":_CollectionsUtilities",
61+
],
62+
)
63+
64+
swift_library(
65+
name = "_CollectionsUtilities",
66+
srcs = glob(["Sources/_CollectionsUtilities/**/*.swift"]),
67+
visibility = ["//visibility:public"],
2168
)

0 commit comments

Comments
 (0)