Toolchainize //scala_proto:{,deps_}toolchain_type #1687
Merged
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
Adds scala_proto toolchains to `scala_toolchains()`. Part of bazelbuild#1482. The most significant part of the change is moving all the toolchain rules from `scala_proto/BUILD` to `setup_scala_toolchains()` in `scala_proto/toolchains.bzl`. Adds the `scala_proto_deps_providers()` macro to replace `//scala_proto:scalapb_{compile,grpc,worker}_deps_provider` targets in the `dep_providers` parameter of `scala_proto_deps_toolchain()`. Examples of this are in `test/proto/custom_generator/BUILD`. Excludes `@scala_proto_rules_scalapb_protoc_gen` from `DEFAULT_SCALAPB_WORKER_DEPS` in `scala_proto/default/default_deps.bzl` for Scala 2.11. For other Scala versions, this repo name will have the Scala version appended. This is to avoid build failures under Bzlmod, since: - This repo is required by ScalaPB 0.11.17, but Scala 2.11 is capped at ScalaPB 0.9.8. - Importing the nonexistent `scala_proto_rules_scalapb_protoc_gen` under Scala 2.11 results in an error under Bzlmod, as does importing it multiple times when configuring multiple Scala versions. - `MODULE.bazel` can iterate over a list of Scala versions, filtering out Scala 2.11, and call `use_repo()` on each version specific repo. A lot of the other changes are more opportunistic removals of `@io_bazel_rules_scala` label prefixes and application of `Label()` where appropriate. Doing this will allow Bzlmod users to use `rules_scala` without setting `repo_name = "@io_bazel_rules_scala"` in `bazel_dep()`.
mbland
force-pushed
the
bzlmod-toolchain-scala-proto
branch
from
7df3082 to
62c17f1
Compare
simuons
approved these changes
Feb 4, 2025
liucijus
approved these changes
Feb 5, 2025
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
Adds scala_proto toolchains to
scala_toolchains(). Part of #1482.The most significant part of the change is moving all the toolchain rules from
scala_proto/BUILDtosetup_scala_toolchains()inscala_proto/toolchains.bzl.Adds the
scala_proto_deps_providers()macro to replace//scala_proto:scalapb_{compile,grpc,worker}_deps_providertargets in thedep_providersparameter ofscala_proto_deps_toolchain(). Examples of this are intest/proto/custom_generator/BUILD.Excludes
@scala_proto_rules_scalapb_protoc_genfromDEFAULT_SCALAPB_WORKER_DEPSinscala_proto/default/default_deps.bzlfor Scala 2.11. For other Scala versions, this repo name will have the Scala version appended.A lot of the other changes are more opportunistic removals of
@io_bazel_rules_scalalabel prefixes and application ofLabel()where appropriate.Motivation
This is the next step in the toolchainization of the frameworks used to implement various rules, as required to implement Bzlmod support.
Excluding
@scala_proto_rules_scalapb_protoc_genfromDEFAULT_SCALAPB_WORKER_DEPSavoids build failures under Bzlmod, since:This repo is required by ScalaPB 0.11.17, but Scala 2.11 is capped at ScalaPB 0.9.8.
Importing the nonexistent
scala_proto_rules_scalapb_protoc_genunder Scala 2.11 results in an error under Bzlmod, as does importing it multiple times when configuring multiple Scala versions.MODULE.bazelcan iterate over a list of Scala versions, filtering out Scala 2.11, and calluse_repo()on each version specific repo.As in other pull requests, removing
@io_bazel_rules_scalalabel prefixes will allow Bzlmod users to userules_scalawithout settingrepo_name = "@io_bazel_rules_scala"inbazel_dep().