Skip to content

Commit cd22d88

Browse files
authored
Bazel 7 compatibility updates (#1619)
* Add toolchain_type to thrift_lib, scrooge aspects This fixes the following error: ```txt Error in create_header_compilation_action: Rule 'thrift_library' in 'rules_scala/test/src/main/scala/scalarules/test/twitter_scrooge/thrift/ thrift_with_compiler_args/BUILD:3:15' must declare '@@bazel_tools//tools/jdk:toolchain_type' toolchain in order to use java_common. See bazelbuild/bazel#18970. ``` Interestingly, adding the toolchain type to `thrift_library` isn't enough; I had to add it to the twitter_scrooge aspects as well. Until I did, it produced the same error message pointing at `thrift_library`, after first reporting: ```txt ERROR: rules_scala/test/src/main/scala/scalarules/test/twitter_scrooge/ thrift/thrift_with_compiler_args/BUILD:3:15: in //twitter_scrooge:twitter_scrooge.bzl%scrooge_java_aspect aspect on thrift_library rule //test/src/main/scala/scalarules/test/twitter_scrooge/thrift/ thrift_with_compiler_args:thrift5: Traceback (most recent call last): File "rules_scala/twitter_scrooge/twitter_scrooge.bzl", line 420, column 49, in _scrooge_java_aspect_impl return _common_scrooge_aspect_implementation(target, ctx, "java", _compile_generated_java) [ ...snip... ] ``` * Fix proto_cross_repo_boundary build_file attribute Bazel 7 enforces that this be a proper target label, not a relative path. ```txt ERROR: WORKSPACE:91:37: fetching new_local_repository rule //external:proto_cross_repo_boundary: .../external/test/proto_cross_repo_boundary/repo/BUILD.repo is not a regular file; if you're using a relative or absolute path for `build_file` in your `new_local_repository` rule, please switch to using a label instead INFO: Repository remote_jdk8_macos instantiated at: WORKSPACE:175:18: in <toplevel> .../external/rules_java/java/repositories.bzl:120:10: in remote_jdk8_repos .../external/bazel_tools/tools/build_defs/repo/utils.bzl:240:18: in maybe .../external/rules_java/toolchains/remote_java_repository.bzl:48:17: in remote_java_repository Repository rule http_archive defined at: .../external/bazel_tools/tools/build_defs/repo/http.bzl:384:31: in <toplevel> ERROR: no such package '@@proto_cross_repo_boundary//': .../external/test/proto_cross_repo_boundary/repo/BUILD.repo is not a regular file; if you're using a relative or absolute path for `build_file` in your `new_local_repository` rule, please switch to using a label instead ERROR: test/proto_cross_repo_boundary/BUILD:3:22: //test/proto_cross_repo_boundary:sample_scala_proto depends on @@proto_cross_repo_boundary//:sample_proto in repository @@proto_cross_repo_boundary which failed to fetch. no such package '@@proto_cross_repo_boundary//': .../external/test/proto_cross_repo_boundary/repo/BUILD.repo is not a regular file; if you're using a relative or absolute path for `build_file` in your `new_local_repository` rule, please switch to using a label instead Use --verbose_failures to see the command lines of failed build steps. ERROR: Analysis of target '//test/proto_cross_repo_boundary:sample_scala_proto' failed; build aborted: Analysis failed ``` * Add rules_python stanza to WORKSPACE files Fixes the following breakages under Bazel 7: ```txt $ bazel build //src/... ERROR: error loading package '@@bazel_tools//src/main/protobuf': cannot load '@@rules_python//python:proto.bzl': no such file ERROR: .../src/java/io/bazel/rulesscala/coverage/instrumenter/BUILD:3:12: error loading package '@@bazel_tools//src/main/protobuf': cannot load '@@rules_python//python:proto.bzl': no such file and referenced by '//src/java/io/bazel/rulesscala/coverage/instrumenter:instrumenter' ``` * Set --noenable_bzlmod to prevent MODULE.bazel Makes sure Bazel doesn't autogenerate MODULE.bazel and MODULE.bazel.lock files for now. * Update to Bazel 6.5.0 This is the last release in the Bazel 6 line. With the changes up to this point, the Bazel 7 build only fails on protobuf generation, e.g. on `bazel build //test/proto3:all`, as seen below. Bumping to Bazel 6.5.0 on top of all the previous changes isolates the Bazel 7.0.0 changes causing the failure. ```txt $ bazel build //test/proto3:all ERROR: .../rules_scala/test/proto3/BUILD:14:14: ProtoScalaPBRule test/proto3/generated-proto-lib_jvm_extra_protobuf_generator_scalapb.srcjar failed: (Exit 1): scalapb_worker failed: error executing ProtoScalaPBRule command (from target //test/proto3:generated-proto-lib) bazel-out/darwin_arm64-opt-exec-ST-13d3ddad9198/bin/src/scala/scripts/scalapb_worker ... (remaining 2 arguments skipped) Could not find file in descriptor database: bazel-out/darwin_arm64-fastbuild/bin/test/proto3/generated.proto: No such file or directory java.lang.RuntimeException: Exit with code 1 at scala.sys.package$.error(package.scala:30) at scripts.ScalaPBWorker$.work(ScalaPBWorker.scala:44) at io.bazel.rulesscala.worker.Worker.persistentWorkerMain(Worker.java:96) at io.bazel.rulesscala.worker.Worker.workerMain(Worker.java:49) at scripts.ScalaPBWorker$.main(ScalaPBWorker.scala:39) at scripts.ScalaPBWorker.main(ScalaPBWorker.scala) Use --verbose_failures to see the command lines of failed build steps. ERROR: .../rules_scala/test/proto3/BUILD:14:14 scala @//test/proto3:generated-proto-lib failed: (Exit 1): scalapb_worker failed: error executing ProtoScalaPBRule command (from target //test/proto3:generated-proto-lib) bazel-out/darwin_arm64-opt-exec-ST-13d3ddad9198/bin/src/scala/scripts/scalapb_worker ... (remaining 2 arguments skipped) ``` * Fix WORKSPACE lint errors One of these days I'll remember to run `bazel run //tools:lint_fix` before opening a pull request. * Set --enable_workspace on last_green CI build Learning more about BuildKite every day. * Allow test_all.sh to pass under Bazel 7 `bash ./test_all.sh` passes after minor updates to the following test cases to handle slightly different behavior under Bazel 7: - `test_custom_reporter_class_has_been_set` makes the test output dir writable, since it no longer is by default. - `test_scala_import_expect_failure_on_missing_direct_deps_warn_mode` removes preexisting output, since Bazel 7 won't emit warnings if it already exists. --- FYI: Under Bazel 7.0 and Bazel 7.1, buildifier warnings for external targets in the following test cases changed to begin with `@@repo_name` instead of `@repo_name`: - test/shell/test_scala_library.sh: `test_scala_library_expect_failure_on_missing_direct_external_deps_jar` `test_scala_library_expect_failure_on_missing_direct_external_deps_file_group` - test/shell/test_strict_dependency.sh: `test_stamped_target_label_loading` `test_strict_deps_filter_included_target` - test/shell/test_test_unused_dependency.sh: `test_unused_deps_filter_included_target` However, as of Bazel 7.2, those warnings changed back to `@repo_name`, so those changes aren't reflected in this commit. * Bump to rules_go 0.39.1 for Bazel 7 compatibility `bazel run //tools:lint_{check,fix}` required updating rules_go to 0.39.1 to work under Bazel 7. The previous rules_go version 0.38.1 caused the following error: ```txt $ ./test_lint.sh ERROR: .../external/io_bazel_rules_go/BUILD.bazel:71:16: in (an implicit dependency) attribute of go_context_data rule @@io_bazel_rules_go//:go_context_data: in $whitelist_function_transition attribute of go_context_data rule @@io_bazel_rules_go//:go_context_data: package group '@@bazel_tools//tools/whitelists/function_transition_whitelist:function_transition_whitelist' is misplaced here (they are only allowed in the visibility attribute) ERROR: .../external/io_bazel_rules_go/BUILD.bazel:71:16: Analysis of target '@@io_bazel_rules_go//:go_context_data' failed ERROR: Analysis of target '//tools:lint_check' failed; build aborted: Analysis failed ``` * Bump to rules_java 7.9.0 for Bazel 7 compatibility Updated rules_java to 7.9.0 to fix errors of the following type under Bazel 7.2.1: ```txt ERROR: test/BUILD:640:10: While resolving toolchains for target //test:jar_lister (096dcc8): invalid registered toolchain '@remote_jdk8_linux_aarch64_toolchain_config_repo//:bootstrap_runtime_toolchain': no such target '@@remote_jdk8_linux_aarch64_toolchain_config_repo//:bootstrap_runtime_toolchain': target 'bootstrap_runtime_toolchain' not declared in package '' defined by .../external/remote_jdk8_linux_aarch64_toolchain_config_repo/BUILD.bazel ERROR: Analysis of target '//test:jar_lister' failed; build aborted ``` Also removed the seemingly unused `rules_java_extra` stanza from `WORKSPACE`. --- Though `rules_java` version 7.12.1 is available, and largely works with this repo when using Bazel 7.3.2, it requires a few temporary workarounds. (As I write this, 8.0.0 came out just a few hours ago and I haven't tried it.) Rather than commit the workarounds, upgrading only to 7.9.0 now seems less crufty. Though this commit only updates Bazel to 7.2.1, I suspect it's probably the same basic problem at play. What follows is a very detailed explanation of what happens with 7.12.1 with Bazel 7.3.2, just to have it on the record. --- The workaround is to change a few toolchain and macro file targets from `@bazel_tools//tools/jdk:` to `@rules_java//toolchains:`. This isn't a terribly bad or invasive workaround, but `@bazel_tools//tools/jdk:` is clearly the canonical path. Best to keep it that way, lest we build up technical debt. Without the workaround, these targets would fail: - //test/src/main/resources/java_sources:CompiledWithJava11 - //test/src/main/resources/java_sources:CompiledWithJava8 - //test/toolchains:java21_toolchain - //test:JunitRuntimePlatform - //test:JunitRuntimePlatform_test_runner - //test:scala_binary_jdk_11 with this error: ```txt ERROR: .../external/rules_java_builtin/toolchains/BUILD:254:14: While resolving toolchains for target @@rules_java_builtin//toolchains:platformclasspath (096dcc8): No matching toolchains found for types @@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type. ``` This appears to be a consequence of both upgrading the Bazel version to 7.3.2 and updating `rules_java` to 7.12.1. The `rules_java_builtin` repo is part of the `WORKSPACE` prefix that adds implicit dependencies: - https://bazel.build/external/migration#builtin-default-deps This repo was added to 7.0.0-pre.20231011.2 in the following change, mapped to `@rules_java` within the scope of the `@bazel_tools` repo: - bazelbuild/bazel: Add rules_java_builtin to the users of Java modules bazelbuild/bazel@ff1abb2 This change tried to ensure `rules_java` remained compatible with earlier Bazel versions. However, it changed all instances of `@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type` to `//toolchains:bootstrap_runtime_toolchain_type`: - bazelbuild/rules_java: Make rules_java backwards compatible with Bazel 6.3.0 bazelbuild/rules_java@30ecf3f Bazel has bumped `rules_java` in its `workspace_deps.bzl` from 7.9.0 to 7.11.0, but it's only available as of 8.0.0-pre.20240911.1. - bazelbuild/bazel: Update rules_java 7.11.1 / java_tools 13.8 bazelbuild/bazel#23571 bazelbuild/bazel@f92124a --- What I believe is happening is, under Bazel 7.3.2 and `rules_java` 7.12.1: - Bazel creates `rules_java` 7.9.0 as `@rules_java_builtin` in the `WORKSPACE` prefix. - `@bazel_tools` has `@rules_java` mapped to `@rules_java_builtin` when initialized during the `WORKSPACE` prefix, during which `@bazel_tools//tools/jdk` registers `alias()` targets to `@rules_java` toolchain targets. These aliased toolchains specify `@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type` in their `toolchains` attribute. - `WORKSPACE` loads `@rules_java` 7.12.1 and registers all its toolchains with type `@rules_java//toolchains:bootstrap_runtime_toolchain_type`. - Some `@rules_java` rules explicitly specifying toolchains from `@bazel_tools//tools/jdk` can't find them, because the `@bazel_tools//tools/jdk` toolchain aliases expect toolchains of type `@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type`. This has broken other projects in the same way: - bazelbuild/bazel: [Bazel CI] Downstream project broken by rules_java upgrade #23619 bazelbuild/bazel#23619 These problems don't appear under Bzlmod, whereby `@rules_java_builtin` was never required. This is because `WORKSPACE` executes its statements sequentially, while Bzlmod builds the module dependency graph _before_ instantiating repositories (within module extensions). It seems a fix is on the way that removes `@rules_java_builtin` from the `WORKSPACE` prefix, and adds `@rules_java` to the suffix. At this moment, though, it's not even in a prerelease: - bazelbuild/bazel: Remove rules_java_builtin in WORKSPACE prefix bazelbuild/bazel@7506690 --- Note that the error message matches that from the following resolved issue, but that issue was for non-Bzlmod child repos when `WORKSPACE` was disabled. - bazelbuild/bazel: Undefined @@rules_java_builtin repository with --noenable_workspace option bazelbuild/bazel#22754
1 parent 7d3f022 commit cd22d88

File tree

34 files changed

+220
-38
lines changed

34 files changed

+220
-38
lines changed

.bazelci/presubmit.yml

+7-6
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ tasks:
3636
shell_commands:
3737
# Install xmllint
3838
- sudo apt update && sudo apt install --reinstall libxml2-utils -y
39+
- echo "build --enable_workspace" >> .bazelrc
3940
- "./test_rules_scala.sh || buildkite-agent annotate --style 'warning' \"Optional build with latest Bazel version failed, [see here](${BUILDKITE_BUILD_URL}#${BUILDKITE_JOB_ID}) (It is not mandatory but worth checking)\""
4041
test_rules_scala_macos:
4142
name: "./test_rules_scala"
@@ -47,16 +48,16 @@ tasks:
4748
platform: windows
4849
shell_commands:
4950
- "bash test_rules_scala.sh"
50-
test_coverage_linux_6_3_0:
51+
test_coverage_linux_6_5_0:
5152
name: "./test_coverage"
5253
platform: ubuntu2004
53-
bazel: 6.3.0
54+
bazel: 6.5.0
5455
shell_commands:
5556
- "./test_coverage.sh"
56-
test_coverage_macos_6.3.0:
57+
test_coverage_macos_6.5.0:
5758
name: "./test_coverage"
5859
platform: macos
59-
bazel: 6.3.0
60+
bazel: 6.5.0
6061
shell_commands:
6162
- "./test_coverage.sh"
6263
test_reproducibility_linux:
@@ -82,13 +83,13 @@ tasks:
8283
examples_linux:
8384
name: "./test_examples"
8485
platform: ubuntu2004
85-
bazel: 6.3.0
86+
bazel: 6.5.0
8687
shell_commands:
8788
- "./test_examples.sh"
8889
cross_build_linux:
8990
name: "./test_cross_build"
9091
platform: ubuntu2004
91-
bazel: 6.3.0
92+
bazel: 6.5.0
9293
shell_commands:
9394
- "./test_cross_build.sh"
9495
lint_linux:

.bazelrc

+4
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,7 @@ build --enable_platform_specific_config
33
#Windows needs --worker_quit_after_build due to workers not being shut down when the compiler tools need to be rebuilt (resulting in 'file in use' errors). See Bazel Issue#10498.
44

55
build:windows --worker_quit_after_build --enable_runfiles
6+
7+
# Remove upon completing Bzlmod compatibility work.
8+
# - https://github.com./bazelbuild/rules_scala/issues/1482
9+
build --noenable_bzlmod

.bazelversion

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
6.3.0
1+
6.5.0

WORKSPACE

+14-16
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,17 @@ load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
1515

1616
bazel_skylib_workspace()
1717

18+
http_archive(
19+
name = "rules_python",
20+
sha256 = "ca77768989a7f311186a29747e3e95c936a41dffac779aff6b443db22290d913",
21+
strip_prefix = "rules_python-0.36.0",
22+
url = "https://github.com./bazelbuild/rules_python/releases/download/0.36.0/rules_python-0.36.0.tar.gz",
23+
)
24+
25+
load("@rules_python//python:repositories.bzl", "py_repositories")
26+
27+
py_repositories()
28+
1829
_build_tools_release = "5.1.0"
1930

2031
http_archive(
@@ -127,10 +138,10 @@ format_repositories()
127138

128139
http_archive(
129140
name = "io_bazel_rules_go",
130-
sha256 = "dd926a88a564a9246713a9c00b35315f54cbd46b31a26d5d8fb264c07045f05d",
141+
sha256 = "6dc2da7ab4cf5d7bfc7c949776b1b7c733f05e56edc4bcd9022bb249d2e2a996",
131142
urls = [
132-
"https://mirror.bazel.build/github.com./bazelbuild/rules_go/releases/download/v0.38.1/rules_go-v0.38.1.zip",
133-
"https://github.com./bazelbuild/rules_go/releases/download/v0.38.1/rules_go-v0.38.1.zip",
143+
"https://mirror.bazel.build/github.com./bazelbuild/rules_go/releases/download/v0.39.1/rules_go-v0.39.1.zip",
144+
"https://github.com./bazelbuild/rules_go/releases/download/v0.39.1/rules_go-v0.39.1.zip",
134145
],
135146
)
136147

@@ -144,19 +155,6 @@ go_rules_dependencies()
144155

145156
go_register_toolchains(version = "1.19.5")
146157

147-
# Explicitly pull in a different (newer) version of rules_java for remote jdks
148-
rules_java_extra_version = "5.1.0"
149-
150-
rules_java_extra_sha = "d974a2d6e1a534856d1b60ad6a15e57f3970d8596fbb0bb17b9ee26ca209332a"
151-
152-
rules_java_extra_url = "https://github.com./bazelbuild/rules_java/releases/download/{}/rules_java-{}.tar.gz".format(rules_java_extra_version, rules_java_extra_version)
153-
154-
http_archive(
155-
name = "rules_java_extra",
156-
sha256 = rules_java_extra_sha,
157-
url = rules_java_extra_url,
158-
)
159-
160158
load("@rules_java//java:repositories.bzl", "remote_jdk8_repos")
161159

162160
# We need to select based on platform when we use these

dt_patches/test_dt_patches/WORKSPACE

+11
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,17 @@ http_archive(
1111
],
1212
)
1313

14+
http_archive(
15+
name = "rules_python",
16+
sha256 = "ca77768989a7f311186a29747e3e95c936a41dffac779aff6b443db22290d913",
17+
strip_prefix = "rules_python-0.36.0",
18+
url = "https://github.com./bazelbuild/rules_python/releases/download/0.36.0/rules_python-0.36.0.tar.gz",
19+
)
20+
21+
load("@rules_python//python:repositories.bzl", "py_repositories")
22+
23+
py_repositories()
24+
1425
local_repository(
1526
name = "io_bazel_rules_scala",
1627
path = "../..",

dt_patches/test_dt_patches_user_srcjar/WORKSPACE

+11
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,17 @@ http_archive(
1111
],
1212
)
1313

14+
http_archive(
15+
name = "rules_python",
16+
sha256 = "ca77768989a7f311186a29747e3e95c936a41dffac779aff6b443db22290d913",
17+
strip_prefix = "rules_python-0.36.0",
18+
url = "https://github.com./bazelbuild/rules_python/releases/download/0.36.0/rules_python-0.36.0.tar.gz",
19+
)
20+
21+
load("@rules_python//python:repositories.bzl", "py_repositories")
22+
23+
py_repositories()
24+
1425
local_repository(
1526
name = "io_bazel_rules_scala",
1627
path = "../..",

examples/crossbuild/.bazelrc

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Remove upon completing Bzlmod compatibility work.
2+
# - https://github.com./bazelbuild/rules_scala/issues/1482
3+
build --noenable_bzlmod

examples/crossbuild/WORKSPACE

+11
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,17 @@ http_archive(
1111
],
1212
)
1313

14+
http_archive(
15+
name = "rules_python",
16+
sha256 = "ca77768989a7f311186a29747e3e95c936a41dffac779aff6b443db22290d913",
17+
strip_prefix = "rules_python-0.36.0",
18+
url = "https://github.com./bazelbuild/rules_python/releases/download/0.36.0/rules_python-0.36.0.tar.gz",
19+
)
20+
21+
load("@rules_python//python:repositories.bzl", "py_repositories")
22+
23+
py_repositories()
24+
1425
local_repository(
1526
name = "io_bazel_rules_scala",
1627
path = "../..",

examples/scala3/.bazelrc

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Remove upon completing Bzlmod compatibility work.
2+
# - https://github.com./bazelbuild/rules_scala/issues/1482
3+
build --noenable_bzlmod

examples/scala3/WORKSPACE

+11
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,17 @@ http_archive(
1111
],
1212
)
1313

14+
http_archive(
15+
name = "rules_python",
16+
sha256 = "ca77768989a7f311186a29747e3e95c936a41dffac779aff6b443db22290d913",
17+
strip_prefix = "rules_python-0.36.0",
18+
url = "https://github.com./bazelbuild/rules_python/releases/download/0.36.0/rules_python-0.36.0.tar.gz",
19+
)
20+
21+
load("@rules_python//python:repositories.bzl", "py_repositories")
22+
23+
py_repositories()
24+
1425
local_repository(
1526
name = "io_bazel_rules_scala",
1627
path = "../..",

examples/semanticdb/.bazelrc

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Remove upon completing Bzlmod compatibility work.
2+
# - https://github.com./bazelbuild/rules_scala/issues/1482
3+
build --noenable_bzlmod

examples/semanticdb/WORKSPACE

+11
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,17 @@ http_archive(
1414
],
1515
)
1616

17+
http_archive(
18+
name = "rules_python",
19+
sha256 = "ca77768989a7f311186a29747e3e95c936a41dffac779aff6b443db22290d913",
20+
strip_prefix = "rules_python-0.36.0",
21+
url = "https://github.com./bazelbuild/rules_python/releases/download/0.36.0/rules_python-0.36.0.tar.gz",
22+
)
23+
24+
load("@rules_python//python:repositories.bzl", "py_repositories")
25+
26+
py_repositories()
27+
1728
local_repository(
1829
name = "io_bazel_rules_scala",
1930
path = "../..",
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,6 @@
11
build --enable_platform_specific_config
22
windows:build --enable_runfiles
3+
4+
# Remove upon completing Bzlmod compatibility work.
5+
# - https://github.com./bazelbuild/rules_scala/issues/1482
6+
build --noenable_bzlmod

examples/testing/multi_frameworks_toolchain/WORKSPACE

+11
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,17 @@ http_archive(
1111
],
1212
)
1313

14+
http_archive(
15+
name = "rules_python",
16+
sha256 = "ca77768989a7f311186a29747e3e95c936a41dffac779aff6b443db22290d913",
17+
strip_prefix = "rules_python-0.36.0",
18+
url = "https://github.com./bazelbuild/rules_python/releases/download/0.36.0/rules_python-0.36.0.tar.gz",
19+
)
20+
21+
load("@rules_python//python:repositories.bzl", "py_repositories")
22+
23+
py_repositories()
24+
1425
local_repository(
1526
name = "io_bazel_rules_scala",
1627
path = "../../..",
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Remove upon completing Bzlmod compatibility work.
2+
# - https://github.com./bazelbuild/rules_scala/issues/1482
3+
build --noenable_bzlmod

examples/testing/scalatest_repositories/WORKSPACE

+11
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,17 @@ http_archive(
1111
],
1212
)
1313

14+
http_archive(
15+
name = "rules_python",
16+
sha256 = "ca77768989a7f311186a29747e3e95c936a41dffac779aff6b443db22290d913",
17+
strip_prefix = "rules_python-0.36.0",
18+
url = "https://github.com./bazelbuild/rules_python/releases/download/0.36.0/rules_python-0.36.0.tar.gz",
19+
)
20+
21+
load("@rules_python//python:repositories.bzl", "py_repositories")
22+
23+
py_repositories()
24+
1425
local_repository(
1526
name = "io_bazel_rules_scala",
1627
path = "../../..",
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,6 @@
11
build --enable_platform_specific_config
2-
windows:build --enable_runfiles
2+
windows:build --enable_runfiles
3+
4+
# Remove upon completing Bzlmod compatibility work.
5+
# - https://github.com./bazelbuild/rules_scala/issues/1482
6+
build --noenable_bzlmod

examples/testing/specs2_junit_repositories/WORKSPACE

+11
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,17 @@ http_archive(
1111
],
1212
)
1313

14+
http_archive(
15+
name = "rules_python",
16+
sha256 = "ca77768989a7f311186a29747e3e95c936a41dffac779aff6b443db22290d913",
17+
strip_prefix = "rules_python-0.36.0",
18+
url = "https://github.com./bazelbuild/rules_python/releases/download/0.36.0/rules_python-0.36.0.tar.gz",
19+
)
20+
21+
load("@rules_python//python:repositories.bzl", "py_repositories")
22+
23+
py_repositories()
24+
1425
local_repository(
1526
name = "io_bazel_rules_scala",
1627
path = "../../..",

scala/private/macros/scala_repositories.bzl

+2-2
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,9 @@ def rules_scala_setup(scala_compiler_srcjar = None):
104104
http_archive(
105105
name = "rules_java",
106106
urls = [
107-
"https://github.com./bazelbuild/rules_java/releases/download/5.4.1/rules_java-5.4.1.tar.gz",
107+
"https://github.com./bazelbuild/rules_java/releases/download/7.9.0/rules_java-7.9.0.tar.gz",
108108
],
109-
sha256 = "a1f82b730b9c6395d3653032bd7e3a660f9d5ddb1099f427c1e1fe768f92e395",
109+
sha256 = "41131de4417de70b9597e6ebd515168ed0ba843a325dc54a81b92d7af9a7b3ea",
110110
)
111111

112112
if not native.existing_rule("rules_proto"):

scala/private/rules/scala_repl.bzl

+4-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,10 @@ def make_scala_repl(*extras):
8181
common_outputs,
8282
*[extra["outputs"] for extra in extras if "outputs" in extra]
8383
),
84-
toolchains = ["@io_bazel_rules_scala//scala:toolchain_type"],
84+
toolchains = [
85+
"@io_bazel_rules_scala//scala:toolchain_type",
86+
"@bazel_tools//tools/jdk:toolchain_type",
87+
],
8588
cfg = scala_version_transition,
8689
incompatible_use_toolchain_transition = True,
8790
implementation = _scala_repl_impl,

test/proto_cross_repo_boundary/repo.bzl

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ def proto_cross_repo_boundary_repository():
22
native.new_local_repository(
33
name = "proto_cross_repo_boundary",
44
path = "test/proto_cross_repo_boundary/repo",
5-
build_file = "test/proto_cross_repo_boundary/repo/BUILD.repo",
5+
build_file = "//test/proto_cross_repo_boundary:repo/BUILD.repo",
66
)

test/shell/test_custom_reporter_class.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,10 @@ test_custom_reporter_class_has_been_set() {
2222
bazel test test/scala_test:custom_reporter
2323
set +e
2424
reporter_output_dir="$(bazel info bazel-testlogs)/test/scala_test/custom_reporter/test.outputs"
25+
chmod u+w "$reporter_output_dir" # Needed under Bazel 7
2526
reporter_output_filepath="${reporter_output_dir}/${custom_reporter_check_file}"
2627
unzip -oq "${reporter_output_dir}/outputs.zip" -d "${reporter_output_dir}"
2728
assert_file_exists "${reporter_output_filepath}"
2829
}
2930

30-
$runner test_custom_reporter_class_has_been_set
31+
$runner test_custom_reporter_class_has_been_set

test/shell/test_strict_dependency.sh

+3
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ test_scala_import_expect_failure_on_missing_direct_deps_warn_mode() {
2121
dependency_target2='//test_expect_failure/scala_import:guava'
2222
test_target='test_expect_failure/scala_import:scala_import_propagates_compile_deps'
2323

24+
# Bazel 7 won't emit warnings if the output already exists.
25+
rm -f "$(bazel info bazel-bin)/${test_target/://}"*
26+
2427
local expected_message1="buildozer 'add deps $dependency_target1' //$test_target"
2528
local expected_message2="buildozer 'add deps $dependency_target2' //$test_target"
2629

test_cross_build/.bazelrc

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Remove upon completing Bzlmod compatibility work.
2+
# - https://github.com./bazelbuild/rules_scala/issues/1482
3+
build --noenable_bzlmod

test_cross_build/WORKSPACE

+11
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,17 @@ http_archive(
1111
],
1212
)
1313

14+
http_archive(
15+
name = "rules_python",
16+
sha256 = "ca77768989a7f311186a29747e3e95c936a41dffac779aff6b443db22290d913",
17+
strip_prefix = "rules_python-0.36.0",
18+
url = "https://github.com./bazelbuild/rules_python/releases/download/0.36.0/rules_python-0.36.0.tar.gz",
19+
)
20+
21+
load("@rules_python//python:repositories.bzl", "py_repositories")
22+
23+
py_repositories()
24+
1425
http_archive(
1526
name = "rules_proto",
1627
sha256 = "8e7d59a5b12b233be5652e3d29f42fba01c7cbab09f6b3a8d0a57ed6d1e9a0da",

test_version/.bazelrc

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Remove upon completing Bzlmod compatibility work.
2+
# - https://github.com./bazelbuild/rules_scala/issues/1482
3+
build --noenable_bzlmod

test_version/WORKSPACE.template

+11
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,17 @@ http_archive(
1111
],
1212
)
1313

14+
http_archive(
15+
name = "rules_python",
16+
sha256 = "ca77768989a7f311186a29747e3e95c936a41dffac779aff6b443db22290d913",
17+
strip_prefix = "rules_python-0.36.0",
18+
url = "https://github.com./bazelbuild/rules_python/releases/download/0.36.0/rules_python-0.36.0.tar.gz",
19+
)
20+
21+
load("@rules_python//python:repositories.bzl", "py_repositories")
22+
23+
py_repositories()
24+
1425
http_archive(
1526
name = "rules_proto",
1627
sha256 = "8e7d59a5b12b233be5652e3d29f42fba01c7cbab09f6b3a8d0a57ed6d1e9a0da",
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Remove upon completing Bzlmod compatibility work.
2+
# - https://github.com./bazelbuild/rules_scala/issues/1482
3+
build --noenable_bzlmod

0 commit comments

Comments
 (0)