forked from enola-dev/enola
-
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix (build): Explicitly specify default_java_toolchain
I had hoped this may fix bazelbuild/bazel#21119, it unfortunately does not - but I'll still keep it.
- Loading branch information
Showing
9 changed files
with
122 additions
and
49 deletions.
There are no files selected for viewing
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
7.0.0 | ||
7.0.2 |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -141,7 +141,11 @@ repos: | |
rev: v4.0.0-alpha.8 | ||
hooks: | ||
- id: prettier | ||
# NOT markdown, because we use markdownlint for that | ||
types_or: [css, html, javascript, json, json5, scss, ts, tsx, yaml] | ||
exclude: ^docs/use|core/impl/src/test/resources|.devcontainer/devcontainer.json | ||
additional_dependencies: | ||
- [email protected] | ||
|
||
- repo: https://github.com/pre-commit/mirrors-csslint | ||
rev: v1.0.5 | ||
|
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
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,39 @@ | ||
# SPDX-License-Identifier: Apache-2.0 | ||
# | ||
# Copyright 2023 The Enola <https://enola.dev> Authors | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# https://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
|
||
# https://github.com/bazelbuild/bazel/issues/21119 | ||
# https://bazel.build/docs/bazel-and-java#config-compilation-toolchains | ||
|
||
# NB: This is "activated" by register_toolchains() in WORKSPACE.bazel! | ||
|
||
load( | ||
"@bazel_tools//tools/jdk:default_java_toolchain.bzl", | ||
"BASE_JDK9_JVM_OPTS", | ||
"DEFAULT_JAVACOPTS", | ||
"DEFAULT_TOOLCHAIN_CONFIGURATION", | ||
"default_java_toolchain", | ||
) | ||
|
||
default_java_toolchain( | ||
name = "repository_default_java_toolchain", | ||
configuration = DEFAULT_TOOLCHAIN_CONFIGURATION, # One of predefined configurations | ||
# Other parameters are from java_toolchain rule: | ||
java_runtime = "@rules_java//toolchains:remotejdk_21", # JDK to use for compilation and toolchain's tools execution | ||
javacopts = DEFAULT_JAVACOPTS + ["--enable_preview"], # Additional javac options | ||
jvm_opts = BASE_JDK9_JVM_OPTS + ["--enable_preview"], # Additional JDK options | ||
source_version = "21", | ||
target_version = "21", | ||
) |
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
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