Add examples/overridden_artifacts and test
#1713
Merged
+137
−3
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 the `examples/overridden_artifacts` repository and the corresponding `overridden_artifacts_example` test case in `test/shell/test_examples.sh`. Broken out from bazelbuild#1710, and part of bazelbuild#1482 and bazelbuild#1652. @dmivankov noticed the design bug in the upcoming Bzlmod API for `overridden_artifacts` that this change addresses. See: - bazelbuild#1482 (comment) - bazelbuild#1482 (comment) Makes `_validate_scalac_srcjar()` and `dt_patched_compiler_setup()` in `scala/private/macros/scala_repositories.bzl` more tolerant of dictionaries containing keys mapped to `None`. The new `overridden_artifacts_example` test covers this. Sets `.bazelversion` in the new repo to 7.5.0 to match changes in both bazelbuild#1710 and bazelbuild#1711. This change is smaller and more focused than bazelbuild#1710, and should ultimately make that pull request smaller and/or easier to review.
simuons
approved these changes
Mar 10, 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 the
examples/overridden_artifactsrepository and the correspondingoverridden_artifacts_exampletest case intest/shell/test_examples.sh. Broken out from #1710, and part of #1482 and #1652.@dmivankov noticed the design bug in the upcoming Bzlmod API for
overridden_artifactsthat this change addresses. See:Makes
_validate_scalac_srcjar()anddt_patched_compiler_setup()inscala/private/macros/scala_repositories.bzlmore tolerant of dictionaries containing keys mapped toNone. The newoverridden_artifacts_exampletest covers this.Sets
.bazelversionin the new repo to 7.5.0 to match changes in both #1710 and #1711.Motivation
This change is smaller and more focused than #1710, and should ultimately make that pull request smaller and/or easier to review.
The
_validate_scalac_srcjar()update maintains the strict checks for mutually exclusive values, while preventing client code from having to explicitly filter outNoneentries. This pairs with the change indt_patched_compiler_setup()that uses thecompiler_srcjardictionary. These changes helps keep the upcoming module extension a bit cleaner.