From 6aa45855a71ac27df9a9bf58c6dde2dda3186052 Mon Sep 17 00:00:00 2001 From: Ilia Kirianovskii Date: Mon, 4 Aug 2025 20:00:29 +0200 Subject: [PATCH] [bazel] Use @community//:k7 (a new one) as kotlinc options for modules w/ language level 1.7 (IJI-2835) GitOrigin-RevId: 8b0ed2c644c8cb32c307ebe1e82a0cf60e0ef690 --- BUILD.bazel | 1 + build/jvm-rules/rules/impl/kotlinc-options.bzl | 2 +- .../jetbrains/intellij/build/bazel/BazelBuildFileGenerator.kt | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/BUILD.bazel b/BUILD.bazel index 8b258ae25889..87c08e19f51d 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -1,6 +1,7 @@ load("@rules_java//java:defs.bzl", "java_binary") load("//build:compiler-options.bzl", "create_kotlinc_options") +create_kotlinc_options(name= "k7", jvm_target = "7") create_kotlinc_options(name= "k8", jvm_target = "8") create_kotlinc_options(name= "k11", jvm_target = "11") create_kotlinc_options(name = "k17", jvm_target = "17") diff --git a/build/jvm-rules/rules/impl/kotlinc-options.bzl b/build/jvm-rules/rules/impl/kotlinc-options.bzl index 09dd99f577cb..b0a1036bbea4 100644 --- a/build/jvm-rules/rules/impl/kotlinc-options.bzl +++ b/build/jvm-rules/rules/impl/kotlinc-options.bzl @@ -57,7 +57,7 @@ _KOPTS = { args = dict( default = "", doc = "The target version of the generated JVM bytecode", - values = ["6", "8", "9", "10", "11", "12", "13", "15", "16", "17"], + values = ["6", "7", "8", "9", "10", "11", "12", "13", "15", "16", "17"], ), type = attr.string, value_to_flag = None, diff --git a/platform/build-scripts/bazel/src/org/jetbrains/intellij/build/bazel/BazelBuildFileGenerator.kt b/platform/build-scripts/bazel/src/org/jetbrains/intellij/build/bazel/BazelBuildFileGenerator.kt index 891418f1cae8..61dac5ea9aae 100644 --- a/platform/build-scripts/bazel/src/org/jetbrains/intellij/build/bazel/BazelBuildFileGenerator.kt +++ b/platform/build-scripts/bazel/src/org/jetbrains/intellij/build/bazel/BazelBuildFileGenerator.kt @@ -758,7 +758,8 @@ internal class BazelBuildFileGenerator( private fun getLanguageLevel(module: JpsModule): String { val languageLevel = javaExtensionService.getLanguageLevel(module) return when { - languageLevel == LanguageLevel.JDK_1_7 || languageLevel == LanguageLevel.JDK_1_8 -> "8" + languageLevel == LanguageLevel.JDK_1_7 -> "7" + languageLevel == LanguageLevel.JDK_1_8 -> "8" languageLevel == LanguageLevel.JDK_1_9 || languageLevel == LanguageLevel.JDK_11 -> "11" languageLevel == LanguageLevel.JDK_17 -> "17" languageLevel != null -> error("Unsupported language level: $languageLevel")