Skip to content

Commit 9d3fa86

Browse files
committed
WIP: Bzlmod part the one hundred nineteenth
Fix twitter_scrooge for test_versions.sh Also fixes a minor failure in `dt_patch_test` when expecting an error from the 2.12.12 srcjar. With this change, both `--enable_bzlmod --noenable_workspace` and `--noenable_bzlmod --enable_workspace` builds pass, at least for Bazel 7.4.0. Without the updates to support `twitter_scrooge`, `test_versions.sh` would fail with: ```txt ERROR: .../test_version/test_scala_version_1730076151/BUILD:18:12: While resolving toolchains for target //:JavaBinary (096dcc8): invalid registered toolchain '@io_bazel_rules_scala_toolchains//twitter_scrooge:scrooge_toolchain': no such package '@@io_bazel_rules_scala_toolchains//twitter_scrooge': BUILD file not found in directory 'twitter_scrooge' of external repository @@io_bazel_rules_scala_toolchains. Add a BUILD file to a directory to mark it as a package. ERROR: Analysis of target '//:JavaBinary' failed; build aborted ``` --- Also, with this change, I'm pretty sure all the old `native.bind()` calls are bypassed in both `WORKSPACE` and Bzlmod modes. I'll try to remove them next.
1 parent c1a39d3 commit 9d3fa86

File tree

17 files changed

+53
-241
lines changed

17 files changed

+53
-241
lines changed

MODULE.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ dev_deps = use_extension(
7777
dev_deps.toolchains(
7878
jmh = True,
7979
scala_proto = True,
80-
scalafmt = True,
8180
#scala_proto_enable_all_options = True,
81+
scalafmt = True,
8282
testing = True,
8383
#scalatest = True,
8484
#junit = True,

MODULE.bazel.lock

Lines changed: 3 additions & 23 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dt_patches/test_dt_patches/MODULE.bazel.lock

Lines changed: 1 addition & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dt_patches/test_dt_patches_user_srcjar/MODULE.bazel.lock

Lines changed: 1 addition & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dt_patches/test_dt_patches_user_srcjar/WORKSPACE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ srcjars_by_version = {
4141
"2.12.11": [],
4242
# Invalid
4343
"2.12.12": {
44-
"label": "foo",
44+
"lable": "foo",
4545
},
4646
# Invalid
4747
"2.12.13": {

examples/crossbuild/MODULE.bazel.lock

Lines changed: 1 addition & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/scala3/MODULE.bazel.lock

Lines changed: 1 addition & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/semanticdb/MODULE.bazel.lock

Lines changed: 1 addition & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/testing/multi_frameworks_toolchain/MODULE.bazel.lock

Lines changed: 1 addition & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)