Skip to content

Commit d469217

Browse files
authored
chore: use swift_gazelle_plugin for examples and other integration tests (#1538)
Use gazelle plugin from `swift_gazelle_plugin`. Related to #924.
1 parent f49b4a9 commit d469217

File tree

198 files changed

+324
-1443
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

198 files changed

+324
-1443
lines changed

BUILD.bazel

Lines changed: 12 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,7 @@ tidy(
3535
"@rules_bazel_integration_test//tools:update_deleted_packages",
3636
":bzlformat_missing_pkgs_fix",
3737
":update_all",
38-
# Run go_mod_tidy before go_update_repos
3938
":go_mod_tidy",
40-
":go_update_repos",
4139
":update_build_files",
4240
],
4341
)
@@ -57,7 +55,6 @@ tidy(
5755
targets = [
5856
":go_get_latest",
5957
":go_mod_tidy",
60-
":go_update_repos",
6158
],
6259
)
6360

@@ -87,19 +84,6 @@ gazelle(
8784
gazelle = ":gazelle_bin",
8885
)
8986

90-
execute_binary(
91-
name = "go_update_repos",
92-
arguments = [
93-
"-gazelle_bin_target=//:gazelle_bin",
94-
"-from_file=go.mod",
95-
"-go_deps_file=go_deps.bzl",
96-
"-macro_name=swift_bazel_go_dependencies",
97-
"-build_external=external",
98-
],
99-
binary = "//tools/update_go_repos",
100-
execute_in_workspace = True,
101-
)
102-
10387
# MARK: - Golang
10488

10589
execute_binary(
@@ -124,13 +108,6 @@ execute_binary(
124108
execute_in_workspace = True,
125109
)
126110

127-
bzl_library(
128-
name = "go_deps",
129-
srcs = ["go_deps.bzl"],
130-
visibility = ["//visibility:public"],
131-
deps = ["@bazel_gazelle//:deps"],
132-
)
133-
134111
# MARK: - Markdown
135112

136113
markdown_pkg(name = "markdown")
@@ -163,25 +140,24 @@ filegroup(
163140
"//config_settings/spm/configuration:all_files",
164141
"//config_settings/spm/platform:all_files",
165142
"//config_settings/spm/platform_configuration:all_files",
166-
"//gazelle:all_files",
167-
"//gazelle/internal/jsonutils:all_files",
168-
"//gazelle/internal/pathdistance:all_files",
169-
"//gazelle/internal/reslog:all_files",
170-
"//gazelle/internal/spdesc:all_files",
171-
"//gazelle/internal/spdump:all_files",
172-
"//gazelle/internal/spreso:all_files",
173-
"//gazelle/internal/stringslices:all_files",
174-
"//gazelle/internal/swift:all_files",
175-
"//gazelle/internal/swiftbin:all_files",
176-
"//gazelle/internal/swiftcfg:all_files",
177-
"//gazelle/internal/swiftpkg:all_files",
178-
"//gazelle/internal/updmarker:all_files",
179143
"//swiftpkg:all_files",
180144
"//swiftpkg/bzlmod:all_files",
181145
"//swiftpkg/internal:all_files",
182146
"//swiftpkg/internal/modulemap_parser:all_files",
183147
"//tools/swift_deps_index:all_files",
184148
"//tools/swift_deps_index/cmd:all_files",
149+
"//tools/swift_deps_index/internal/jsonutils:all_files",
150+
"//tools/swift_deps_index/internal/pathdistance:all_files",
151+
"//tools/swift_deps_index/internal/reslog:all_files",
152+
"//tools/swift_deps_index/internal/spdesc:all_files",
153+
"//tools/swift_deps_index/internal/spdump:all_files",
154+
"//tools/swift_deps_index/internal/spreso:all_files",
155+
"//tools/swift_deps_index/internal/stringslices:all_files",
156+
"//tools/swift_deps_index/internal/swift:all_files",
157+
"//tools/swift_deps_index/internal/swiftbin:all_files",
158+
"//tools/swift_deps_index/internal/swiftcfg:all_files",
159+
"//tools/swift_deps_index/internal/swiftpkg:all_files",
160+
"//tools/swift_deps_index/internal/updmarker:all_files",
185161
],
186162
visibility = ["//:__subpackages__"],
187163
)

bzlmod/workspace/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ gazelle_binary(
2424
name = "gazelle_bin",
2525
languages = [
2626
"@bazel_skylib_gazelle_plugin//bzl",
27-
"@rules_swift_package_manager//gazelle",
27+
"@swift_gazelle_plugin//gazelle",
2828
],
2929
)
3030

bzlmod/workspace/MODULE.bazel

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,11 @@ bazel_dep(
3030
dev_dependency = True,
3131
repo_name = "bazel_gazelle",
3232
)
33+
bazel_dep(
34+
name = "swift_gazelle_plugin",
35+
version = "0.1.0",
36+
dev_dependency = True,
37+
)
3338

3439
apple_cc_configure = use_extension(
3540
"@apple_support//crosstool:setup.bzl",

examples/firebase_example/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ gazelle_binary(
1717
name = "gazelle_bin",
1818
languages = [
1919
"@bazel_skylib_gazelle_plugin//bzl",
20-
"@rules_swift_package_manager//gazelle",
20+
"@swift_gazelle_plugin//gazelle",
2121
],
2222
)
2323

examples/firebase_example/MODULE.bazel

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,11 @@ bazel_dep(
4040
dev_dependency = True,
4141
repo_name = "bazel_gazelle",
4242
)
43+
bazel_dep(
44+
name = "swift_gazelle_plugin",
45+
version = "0.1.0",
46+
dev_dependency = True,
47+
)
4348

4449
apple_cc_configure = use_extension(
4550
"@apple_support//crosstool:setup.bzl",

examples/google_maps_example/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ gazelle_binary(
1717
name = "gazelle_bin",
1818
languages = [
1919
"@bazel_skylib_gazelle_plugin//bzl",
20-
"@rules_swift_package_manager//gazelle",
20+
"@swift_gazelle_plugin//gazelle",
2121
],
2222
)
2323

examples/google_maps_example/MODULE.bazel

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,11 @@ bazel_dep(
3232
dev_dependency = True,
3333
repo_name = "bazel_gazelle",
3434
)
35+
bazel_dep(
36+
name = "swift_gazelle_plugin",
37+
version = "0.1.0",
38+
dev_dependency = True,
39+
)
3540

3641
apple_cc_configure = use_extension(
3742
"@apple_support//crosstool:setup.bzl",

examples/grpc_example/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ gazelle_binary(
2424
languages = [
2525
"@bazel_skylib_gazelle_plugin//bzl",
2626
"@bazel_gazelle//language/proto",
27-
"@rules_swift_package_manager//gazelle",
27+
"@swift_gazelle_plugin//gazelle",
2828
],
2929
)
3030

examples/grpc_example/MODULE.bazel

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,11 @@ bazel_dep(
4848
dev_dependency = True,
4949
repo_name = "bazel_gazelle",
5050
)
51+
bazel_dep(
52+
name = "swift_gazelle_plugin",
53+
version = "0.1.0",
54+
dev_dependency = True,
55+
)
5156

5257
bazel_dep(name = "rules_proto", version = "7.1.0")
5358

examples/grpc_package_example/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ gazelle_binary(
2323
languages = [
2424
"@bazel_skylib_gazelle_plugin//bzl",
2525
"@bazel_gazelle//language/proto",
26-
"@rules_swift_package_manager//gazelle",
26+
"@swift_gazelle_plugin//gazelle",
2727
],
2828
)
2929

0 commit comments

Comments
 (0)