Fix java toolchain config to allow for use with Bazel 6 #273
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
tshaynik
force-pushed
the
bazel6-java-toolchain
branch
5 times, most recently
from
871a9a7
to
9f0230a
Compare
|
The java tests failure on MacOS seems to be resolved by setting |
tshaynik
force-pushed
the
bazel6-java-toolchain
branch
2 times, most recently
from
9f689e6
to
c16bd7c
Compare
default_java_toolchain.bzl and local_java_repository.bzl are included from Bazel commit 3d5c5d746b286c840ba5cfd437d93d8d11995e02 and modified to add support for nix constraints. Closes #272
tshaynik
force-pushed
the
bazel6-java-toolchain
branch
2 times, most recently
from
4459374
to
f3d68f3
Compare
|
This is rebased, tested with Bazel 6, and now reset to Bazel 5, and ready for review. I've created #299 to track the lingering Java test dependency issue on MacOS, and plan for the removal of the |
tshaynik
changed the title
avdv
requested changes
Dec 23, 2022
This causes a warning instead of an error for strict Java dependencies on MacOS. This is a temporary workaround for #299 and should be removed as soon as that issue is resolved.
tshaynik
force-pushed
the
bazel6-java-toolchain
branch
from
f3d68f3
to
10a8662
Compare
|
@avdv I just wanted to follow up about this PR! Is there anything else this needs before it can be merged? |
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.
Resolves #272
This change allows for using rules_nixpkgs with Bazel 6, by fixing an issue caused by changes in how java toolchains are configured.
This works by pulling in versions of local_java_repository.bzl and default_java_toolchain.bzl from a newer version of Bazel, and reapplying the the changes necessary to enforce the constraint that nix be present.
TODO before merging: