Skip to content

Commit ec85c7b

Browse files
authored
Drop support for workspace-based builds (#321)
1 parent f392b39 commit ec85c7b

File tree

43 files changed

+1098
-1330
lines changed

Some content is hidden

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

43 files changed

+1098
-1330
lines changed

.github/workflows/workspace_based.yaml

Lines changed: 0 additions & 39 deletions
This file was deleted.

BUILD.bazel

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
load("@bazel_gazelle//:def.bzl", "DEFAULT_LANGUAGES", "gazelle", "gazelle_binary")
2-
load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
32
load("@com_github_bazelbuild_buildtools//buildifier:def.bzl", "buildifier")
43

54
buildifier(
@@ -47,33 +46,3 @@ gazelle_binary(
4746
gazelle(
4847
name = "gazelle_go",
4948
)
50-
51-
bzl_library(
52-
name = "repositories",
53-
srcs = ["repositories.bzl"],
54-
visibility = ["//visibility:public"],
55-
deps = [
56-
"//java/private:zip_repository",
57-
"@bazel_tools//tools/build_defs/repo:http.bzl",
58-
"@bazel_tools//tools/build_defs/repo:utils.bzl",
59-
],
60-
)
61-
62-
bzl_library(
63-
name = "setup",
64-
srcs = ["setup.bzl"],
65-
visibility = ["//visibility:public"],
66-
deps = [
67-
"@apple_rules_lint//lint:implementation",
68-
"@contrib_rules_jvm_deps//:defs",
69-
],
70-
)
71-
72-
bzl_library(
73-
name = "gazelle_setup",
74-
srcs = ["gazelle_setup.bzl"],
75-
visibility = ["//visibility:public"],
76-
deps = [
77-
"//third_party/go:repositories",
78-
],
79-
)

MODULE.bazel

Lines changed: 15 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -11,65 +11,19 @@ PROTOBUF_VERSION = "21.7"
1111
# The java packages are published to maven under a different versioning scheme.
1212
PROTOBUF_JAVA_VERSION = "3.{}".format(PROTOBUF_VERSION)
1313

14-
bazel_dep(
15-
name = "apple_rules_lint",
16-
version = "0.4.0",
17-
)
18-
bazel_dep(
19-
name = "bazel_skylib",
20-
version = "1.7.1",
21-
)
22-
23-
bazel_dep(
24-
name = "bazel_skylib_gazelle_plugin",
25-
version = "1.7.1",
26-
dev_dependency = True,
27-
)
28-
29-
bazel_dep(
30-
name = "gazelle",
31-
version = "0.39.1",
32-
repo_name = "bazel_gazelle",
33-
)
34-
bazel_dep(
35-
name = "protobuf",
36-
version = "27.2",
37-
repo_name = "com_google_protobuf",
38-
)
39-
bazel_dep(
40-
name = "rules_cc",
41-
version = "0.0.11",
42-
)
43-
bazel_dep(
44-
name = "rules_go",
45-
version = "0.50.1",
46-
repo_name = "io_bazel_rules_go",
47-
)
48-
bazel_dep(
49-
name = "rules_java",
50-
version = "7.12.1",
51-
)
52-
bazel_dep(
53-
name = "rules_jvm_external",
54-
version = "6.6",
55-
)
56-
bazel_dep(
57-
name = "rules_proto",
58-
version = "6.0.2",
59-
)
60-
61-
bazel_dep(
62-
name = "stardoc",
63-
version = "0.7.1",
64-
dev_dependency = True,
65-
repo_name = "io_bazel_stardoc",
66-
)
67-
68-
non_module_deps = use_extension("//java/private:non-module-deps.bzl", "non_module_deps")
69-
use_repo(
70-
non_module_deps,
71-
"io_grpc_grpc_java",
72-
)
14+
bazel_dep(name = "apple_rules_lint", version = "0.4.0")
15+
bazel_dep(name = "bazel_skylib", version = "1.7.1")
16+
bazel_dep(name = "grpc-java", version = "1.69.0")
17+
bazel_dep(name = "gazelle", version = "0.42.0", repo_name = "bazel_gazelle")
18+
bazel_dep(name = "protobuf", version = "29.1", repo_name = "com_google_protobuf")
19+
bazel_dep(name = "rules_cc", version = "0.0.16")
20+
bazel_dep(name = "rules_go", version = "0.52.0")
21+
bazel_dep(name = "rules_java", version = "7.12.2")
22+
bazel_dep(name = "rules_jvm_external", version = "6.6")
23+
bazel_dep(name = "rules_proto", version = "7.0.2")
24+
25+
bazel_dep(name = "bazel_skylib_gazelle_plugin", version = "1.7.1", dev_dependency = True)
26+
bazel_dep(name = "stardoc", version = "0.7.1", dev_dependency = True, repo_name = "io_bazel_stardoc")
7327

7428
linter = use_extension("@apple_rules_lint//lint:extensions.bzl", "linter")
7529
linter.register(name = "java-checkstyle")
@@ -246,8 +200,8 @@ use_repo(
246200
"contrib_rules_jvm_tests",
247201
)
248202

249-
go_sdk = use_extension("@io_bazel_rules_go//go:extensions.bzl", "go_sdk")
250-
go_sdk.download(version = "1.21.5")
203+
go_sdk = use_extension("@rules_go//go:extensions.bzl", "go_sdk")
204+
go_sdk.download(version = "1.23.6")
251205

252206
go_deps = use_extension("@bazel_gazelle//:extensions.bzl", "go_deps")
253207
go_deps.from_file(go_mod = "//:go.mod")

examples/gazelle/.bazelversion

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../.bazelversion

examples/gazelle/MODULE.bazel

Lines changed: 5 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,15 @@ module(
33
version = "0.0.0",
44
)
55

6-
bazel_dep(
7-
name = "contrib_rules_jvm",
8-
version = "0.0.0",
9-
)
6+
bazel_dep(name = "contrib_rules_jvm", version = "0.0.0")
107
local_path_override(
118
module_name = "contrib_rules_jvm",
129
path = "../..",
1310
)
1411

15-
bazel_dep(
16-
name = "bazel_skylib",
17-
version = "1.5.0",
18-
)
19-
bazel_dep(
20-
name = "rules_jvm_external",
21-
version = "6.2",
22-
)
12+
bazel_dep(name = "bazel_skylib", version = "1.7.1")
13+
bazel_dep(name = "gazelle", version = "0.42.0")
14+
bazel_dep(name = "rules_jvm_external", version = "6.6")
2315

2416
maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
2517
maven.install(
@@ -33,18 +25,4 @@ maven.install(
3325
fetch_sources = True,
3426
lock_file = "//:maven_install.json",
3527
)
36-
use_repo(
37-
maven,
38-
"maven",
39-
"unpinned_maven",
40-
)
41-
42-
bazel_dep(
43-
name = "gazelle",
44-
version = "0.36.0",
45-
)
46-
git_override(
47-
module_name = "gazelle",
48-
commit = "ba2ce367a545e0bdd74a7abca40ef5e0a0cb8dcb",
49-
remote = "https://github.com/bazelbuild/bazel-gazelle.git",
50-
)
28+
use_repo(maven, "maven")

0 commit comments

Comments
 (0)