use java 17 for rules_jvm builder

GitOrigin-RevId: 0cb6f6f447a66d9d23277c6394c827a0abf62189
This commit is contained in:
Vladimir Krivosheev
2025-05-17 19:08:03 +00:00
committed by intellij-monorepo-bot
parent 179f377358
commit a8d5b96f57
2 changed files with 12 additions and 13 deletions
+3 -3
View File
@@ -1,14 +1,14 @@
# https://bazel.build/docs/bazel-and-java#hermetic-testing
# The code is compiled for, executed, and tested on this JVM.
build --java_language_version=21
build --java_language_version=17
build --java_runtime_version=remotejdk_21
# https://bazel.build/docs/bazel-and-java#config-build-tools-java
# A second pair of JDK and JVM used to build and execute tools, which are used in the build process, but are not in the build results.
# That JDK and JVM are controlled using --tool_java_language_version and --tool_java_runtime_version
build --tool_java_language_version=21
build --tool_java_language_version=17
# Java runtime the tools should use
build --tool_java_runtime_version=remotejdk_21
build --tool_java_runtime_version=remotejdk_17
common --@rules_jvm//:koltin_inc_threshold=0 --@rules_jvm//:java_inc_threshold=0
+9 -10
View File
@@ -22,7 +22,6 @@ label_flag(
visibility = ["//visibility:public"],
)
kt_kotlinc_options(
name = "default-kotlinc-opts-value",
visibility = ["//visibility:public"],
@@ -48,10 +47,12 @@ int_flag(
_kt_kotlinc_options(
name = "rules_jvm_bootstrap_kotlinc_options",
include_stdlibs = "none",
jvm_target = "17",
visibility = [
"//src:__subpackages__",
"//zip:__pkg__",
],
x_jdk_release = "17",
)
# java_import(
@@ -67,13 +68,13 @@ jvm_import(
jar = "@jps-standalone_http//file",
source_jar = "@jps-standalone_http//file",
visibility = [
"//dependency-graph:__subpackages__",
"//jps-builders-6:__subpackages__",
"//jvm-inc-builder:__subpackages__",
"//src/jps-shadow:__subpackages__",
"//src/jvm-builder:__subpackages__",
"//src/jvm-builder-core:__subpackages__",
"//src/kotlin/kotlin-builder:__subpackages__",
"//jvm-inc-builder:__subpackages__",
"//jps-builders-6:__subpackages__",
"//dependency-graph:__subpackages__",
],
)
@@ -84,6 +85,7 @@ jvm_import(
"//jps-builders-6:__subpackages__",
],
)
jvm_import(
name = "netty-codec-jps",
jar = "@netty-codec-jps_http//file",
@@ -92,8 +94,6 @@ jvm_import(
],
)
jvm_import(
name = "jps-javac-extension",
jar = "@jps-javac-extension//file",
@@ -101,12 +101,11 @@ jvm_import(
)
jvm_import(
name = "javax-annotation-api",
jar = "@javax_annotation-api-1_3_2_http//file",
visibility = ["//visibility:public"]
name = "javax-annotation-api",
jar = "@javax_annotation-api-1_3_2_http//file",
visibility = ["//visibility:public"],
)
# jvm_import(
# name = "kotlin-compiler",
# jar = "@kotlin-compiler//file",