Skip to content

Commit 7cc7984

Browse files
committed
Bazel 9
1 parent ad49401 commit 7cc7984

9 files changed

Lines changed: 1854 additions & 12575 deletions

File tree

.bazelrc

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
11
# Options common for all EngFlow remote configurations.
22
common --@aspect_rules_ts//ts:skipLibCheck=honor_tsconfig
33
common --@aspect_rules_ts//ts:default_to_tsc_transpiler
4-
common --noincompatible_check_sharding_support
5-
common --incompatible_disable_autoloads_in_main_repo
6-
7-
# Remove once proto toolchainization becomes the default
8-
# - https://bazel.build/reference/command-line-reference#flag--incompatible_enable_proto_toolchain_resolution
9-
# - https://docs.google.com/document/d/1CE6wJHNfKbUPBr7-mmk_0Yo3a4TaqcTPE0OWNuQkhPs/edit
10-
common --incompatible_enable_proto_toolchain_resolution
114

125
build --java_runtime_version=remotejdk_11
136
build --java_language_version=11

.bazelversion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
8.4.2
1+
9.0.0

MODULE.bazel

Lines changed: 30 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -47,15 +47,15 @@ http_archive(
4747

4848
register_toolchains("@rules_scala_protoc_toolchains//:all")
4949

50-
bazel_dep(name = "bazel_skylib", version = "1.7.1")
50+
bazel_dep(name = "bazel_skylib", version = "1.8.2")
5151
bazel_dep(name = "engflowapis-java", version = "2025.03.14-12.58.52")
5252
bazel_dep(name = "platforms", version = "1.0.0")
53-
bazel_dep(name = "protobuf", version = "30.2")
53+
bazel_dep(name = "protobuf", version = "33.0")
5454
single_version_override(
5555
module_name = "protobuf",
5656
patch_strip = 1,
5757
patches = ["//scala:0001-protobuf-19679-rm-protoc-dep.patch"],
58-
version = "30.2",
58+
version = "33.0",
5959
)
6060

6161
# Per the instructions from:
@@ -64,16 +64,22 @@ single_version_override(
6464
# If you also depend on `rules_cc`, `apple_support` must come _above_ `rules_cc`
6565
# in your `MODULE.bazel` or `WORKSPACE` file because Bazel selects toolchains
6666
# based on which is registered first.
67-
bazel_dep(name = "apple_support", version = "1.22.0")
68-
bazel_dep(name = "rules_cc", version = "0.1.1")
67+
bazel_dep(name = "apple_support", version = "1.24.2")
68+
bazel_dep(name = "rules_cc", version = "0.2.14")
6969

7070
# https://github.com/googleapis/googleapis/pull/855
7171
# https://github.com/bazelbuild/bazel-central-registry/pull/1699
7272
bazel_dep(
7373
name = "googleapis",
74-
version = "0.0.0-20241220-5e258e33.bcr.1",
74+
version = "0.0.0-20260109-6145b5ff",
75+
)
76+
single_version_override(
77+
module_name = "googleapis",
78+
patch_strip = 1,
79+
patches = ["//:googleapis-loads.patch"],
7580
)
76-
bazel_dep(name = "rules_python", version = "1.4.1")
81+
82+
bazel_dep(name = "rules_python", version = "1.7.0")
7783

7884
PYTHON_VERSION = "3.12"
7985

@@ -91,8 +97,7 @@ pip.parse(
9197
)
9298
use_repo(pip, "pip")
9399

94-
bazel_dep(name = "rules_proto", version = "7.1.0")
95-
bazel_dep(name = "rules_dotnet", version = "0.19.2")
100+
bazel_dep(name = "rules_dotnet", version = "0.21.5")
96101

97102
dotnet = use_extension("@rules_dotnet//dotnet:extensions.bzl", "dotnet")
98103
dotnet.toolchain(dotnet_version = "8.0.200")
@@ -101,10 +106,10 @@ use_repo(dotnet, "dotnet_toolchains")
101106
register_toolchains("@dotnet_toolchains//:all")
102107

103108
# https://github.com/bazelbuild/rules_go/blob/master/docs/go/core/bzlmod.md
104-
bazel_dep(name = "rules_go", version = "0.54.0")
105-
bazel_dep(name = "gazelle", version = "0.43.0")
109+
bazel_dep(name = "rules_go", version = "0.59.0")
110+
bazel_dep(name = "gazelle", version = "0.46.0")
106111

107-
GO_VERSION = "1.24.3"
112+
GO_VERSION = "1.25.6"
108113

109114
go_sdk = use_extension("@rules_go//go:extensions.bzl", "go_sdk")
110115
go_sdk.download(version = GO_VERSION)
@@ -113,14 +118,12 @@ go_deps = use_extension("@gazelle//:extensions.bzl", "go_deps")
113118
go_deps.from_file(go_mod = "//:go.mod")
114119
use_repo(go_deps, "com_github_google_go_cmp")
115120

116-
bazel_dep(name = "rules_java", version = "8.12.0")
121+
bazel_dep(name = "rules_java", version = "9.0.3")
117122

118123
# https://github.com/bazelbuild/rules_jvm_external/blob/master/docs/bzlmod.md
119-
bazel_dep(name = "rules_jvm_external", version = "6.7")
120-
bazel_dep(name = "grpc-java", version = "1.71.0")
121-
122-
# Loads rules required to compile proto files
123-
bazel_dep(name = "rules_proto_grpc", version = "5.0.1")
124+
bazel_dep(name = "rules_jvm_external", version = "6.9")
125+
bazel_dep(name = "grpc-java", version = "1.78.0")
126+
bazel_dep(name = "grpc", version = "1.76.0.bcr.1")
124127

125128
maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
126129
maven.install(
@@ -140,10 +143,12 @@ maven.install(
140143
)
141144
use_repo(maven, "maven")
142145

143-
bazel_dep(name = "rules_kotlin", version = "2.1.4")
144-
bazel_dep(name = "rules_perl", version = "0.4.2")
145-
bazel_dep(name = "rules_swift", version = "2.8.2")
146-
bazel_dep(name = "aspect_rules_ts", version = "3.5.3")
146+
bazel_dep(name = "rules_kotlin", version = "2.1.10")
147+
bazel_dep(name = "rules_perl", version = "0.5.0")
148+
bazel_dep(name = "rules_swift", version = "3.3.0")
149+
bazel_dep(name = "rules_nodejs", version = "6.6.0")
150+
bazel_dep(name = "aspect_rules_ts", version = "3.7.1")
151+
bazel_dep(name = "aspect_bazel_lib", version = "2.21.2")
147152

148153
rules_ts_ext = use_extension(
149154
"@aspect_rules_ts//ts:extensions.bzl",
@@ -153,13 +158,13 @@ rules_ts_ext = use_extension(
153158
rules_ts_ext.deps()
154159
use_repo(rules_ts_ext, "npm_typescript")
155160

156-
bazel_dep(name = "rules_scala", version = "7.0.0")
161+
bazel_dep(name = "rules_scala", version = "7.1.6")
157162

158163
scala_config = use_extension(
159164
"@rules_scala//scala/extensions:config.bzl",
160165
"scala_config",
161166
)
162-
scala_config.settings(scala_version = "2.13.16")
167+
scala_config.settings(scala_version = "2.13.17")
163168

164169
scala_deps = use_extension(
165170
"@rules_scala//scala/extensions:deps.bzl",
@@ -175,4 +180,4 @@ scala_protoc = use_extension(
175180
)
176181
use_repo(scala_protoc, "rules_scala_protoc_toolchains")
177182

178-
bazel_dep(name = "rules_shell", version = "0.5.0")
183+
bazel_dep(name = "rules_shell", version = "0.6.1")

0 commit comments

Comments
 (0)