Extract dev_deps_repositories() from WORKSPACE and remove //private
#1656
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
`dev_deps_repositories()` encapsulates the instantiation of repositories used only for `rules_scala` development. Also removes the unused `//private` package and its `WORKSPACE` statements. Part of bazelbuild#1482. Both `WORKSPACE` and Bzlmod builds can use this macro, though how Bzlmod will use it will depend on whether we continue building with Bazel 6. `@bazel_tools//tools/build_defs/repo:local.bzl` isn't available under Bazel 6. To continue building with Bazel 6 under Bzlmod, we will need to call `dev_deps_repositories()` from `WORKSPACE.bzlmod` to continue using `native.{,new_}local_repository()`. If we switch to Bazel 7, we can load `local.bzl` and strip the `native.` prefix from the `{,new_}local_repository()` calls. Then we can call `dev_deps_repositories()` from a module extension instead of from `WORKSPACE.bzlmod`. Another alternative would be updating the local repositories to become proper nested repositories. Then we can call `local_repository()` from `WORKSPACE` and call `bazel_dep()` and `local_path_override()` from `MODULE.bazel`. In that case, we'd remove the `{,new_}local_repository` calls from `dev_deps_dependencies()`, and remove `proto_cross_repo_boundary_repository()` entirely.
Removes `native.{,new_}local_repository()` calls in macros in favor of
`local_repository` calls from `WORKSPACE`. Part of bazelbuild#1482.
`native.{,new_}local_repository()` isn't available under Bzlmod,
`@bazel_tools//tools/build_defs/repo:local.bzl` with the Starlarkified
definitions isn't available under Bazel 6, and Bazel 8 compatibility
work is imminent. Redefining the repositories in this way will be
compatible with Bazel 6, 7, and 8, both under `WORKSPACE` and Bzlmod.
(`MODULE.bazel` will use a combination of `bazel_dep()` and
`local_path_override()`.)
This was referenced Dec 2, 2024
liucijus
approved these changes
Dec 8, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
dev_deps_repositories()encapsulates the instantiation of repositories used only forrules_scaladevelopment. Also removes the unused//privatepackage and itsWORKSPACEstatements. Part of #1482 and #1652.Replaces existing
new_local_repositorycalls with complete nested repositories (with their ownWORKSPACEfiles) andlocal_repositorycalls in the mainWORKSPACEfile. The first commit, however, callsnative.{,new_}local_repositoryinsidedev_deps_repositories(), in case we wish to use that implementation instead.Motivation
Both
WORKSPACEand Bzlmod builds can use this macro. However, the two commits in this pull request reflect different strategies towards handling the existingnew_local_repositorycalls.Either way, we need to update the
new_local_repositorycalls because:native.{,new_}local_repository()aren't available under Bzlmod (Support Bzlmod and add rules_scala to bazel-central-registry #1482).@bazel_tools//tools/build_defs/repo:local.bzlwith the Starlarkified definitions isn't available under Bazel 6.There are two paths we can go by (but in the long run, there's still time to change the road we're on):
Replacing the
new_local_repositoryinstances with complete nested repositories is compatible with Bazel 6, 7, and 8, both underWORKSPACEand Bzlmod. (MODULE.bazelwill use a combination ofbazel_dep()andlocal_path_override().) That's the change reflected by the pull request as a whole.If keeping the
new_local_repositorycalls is preferable, we'll have to usenative.new_local_repositoryandnative.local_repositoryindev_deps_repositories(). Then, when we switch to building with Bazel 7 by default, we'll have to loadlocal.bzland strip thenative.prefixes.