Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update Bazel Version from 6.4.0 to 7.0.0 #390

Closed
wants to merge 10 commits into from
Closed

Update Bazel Version from 6.4.0 to 7.0.0 #390

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8727128
feat (deps): Update Bazel Version from 6.4.0 to 7.0.0
vorburger Dec 31, 2023
1bef794
feat (deps): Update gRPC from 1.54.1 to 1.60.1
vorburger Dec 31, 2023
e9298e7
fix (deps): Update MODULE.bazel.lock
vorburger Jan 7, 2024
0e410a3
fix (deps): Attempt (in vain) to patch grpc-java to work around http…
vorburger Jan 7, 2024
ec355b2
Remove toolchains = ['@bazel_tools//tools/jdk:toolchain_type']
vorburger Jan 17, 2024
694c55e
chore(deps): Bump rules_java version from 7.2.0 to 7.3.2
vorburger Jan 17, 2024
5b62332
Drop grpc-java patch, as this isn't required, after all
vorburger Jan 17, 2024
964e8a0
gRPC exclusion https:/grpc/grpc-java/issues/10576
vorburger Jan 17, 2024
2ec63f6
Remove gRPC exclusion and it still works?! (After unified Maven deps.)
vorburger Jan 17, 2024
be93d24
Undo .bazelrc commenting out
vorburger Jan 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .bazelversion
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6.4.0
7.0.0
5 changes: 5 additions & 0 deletions .editorconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,11 @@ generated_code = true
indent_size = unset
max_line_length = unset

[MODULE.bazel.lock]
generated_code = true
indent_size = unset
max_line_length = unset

[test-random-binary]
insert_final_newline = false

Expand Down
39 changes: 1 addition & 38 deletions MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,49 +15,12 @@
# limitations under the License.

# https://registry.bazel.build/modules/rules_java
bazel_dep(name = "rules_java", version = "7.2.0")
bazel_dep(name = "rules_java", version = "7.3.2")

# https:/bazelbuild/rules_jvm_external/blob/master/docs/bzlmod.md#installation
# When bumping the version here, must always run: REPIN=1 bazel run @unpinned_maven//:pin
bazel_dep(name = "rules_jvm_external", version = "5.3")

# TODO Declare Maven dependencies in 1 single place, instead of both here
# as well as in maven_install() of WORKSPACE.bazel; try moving that here?
maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
maven.install(
artifacts = [
"junit:junit:4.13.2",
# Google
"com.google.guava:guava:33.0.0-jre",
"com.google.truth:truth:1.2.0",
"com.google.truth.extensions:truth-java8-extension:1.2.0",
"com.google.template:soy:2023-09-13",
# Protobuf
"com.google.protobuf:protobuf-java:4.0.0-rc-2",
"com.google.protobuf:protobuf-java-util:4.0.0-rc-2",
# gRPC
"com.google.api.grpc:proto-google-common-protos:2.29.0",
# Keep gRPC version in sync with WORKSPACE.bazel
"io.grpc:grpc-netty:1.54.1", # Alternative: grpc-netty-shaded
"io.grpc:grpc-stub:1.54.1",
"io.grpc:grpc-core:1.54.1", # for inprocess
"org.apache.tomcat:annotations-api:6.0.53", # NOT :tomcat-annotations-api
# kubernetes:client-java also depends on Protobuf (+gRPC?), version may need to be upgraded together
"io.kubernetes:client-java:19.0.0",
# Other
"ch.vorburger.exec:exec:3.1.5",
"com.github.java-json-tools:uri-template:0.10",
"info.picocli:picocli:4.7.5",
"org.snakeyaml:snakeyaml-engine:2.7",
"org.slf4j:slf4j-jdk14:2.0.9",
"org.slf4j:slf4j-simple:2.0.9",
"io.github.classgraph:classgraph:4.8.165",
],
fetch_sources = True,
lock_file = "//:maven_install.json",
)
use_repo(maven, "maven", "unpinned_maven")

# https:/bazelbuild/rules_go/blob/master/docs/go/core/bzlmod.md
bazel_dep(name = "rules_go", version = "0.44.2")
bazel_dep(name = "gazelle", version = "0.35.0")
Expand Down
Loading
Loading