diff options
| author | pazus <pazus@yandex-team.com> | 2023-10-06 08:06:52 +0300 |
|---|---|---|
| committer | pazus <pazus@yandex-team.com> | 2023-10-06 08:24:14 +0300 |
| commit | 816919c03e6ef1f4fa5b5dbd45d4e47499e646b1 (patch) | |
| tree | 6c235b7ef29d237ce92aad015eee2a94ac6e28b6 | |
| parent | 36de207157f5a309c5686a46f010271b4a1bf8bb (diff) | |
| download | ydb-816919c03e6ef1f4fa5b5dbd45d4e47499e646b1.tar.gz | |
Update kotlin to 1.9.10
| -rw-r--r-- | build/conf/java.conf | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/build/conf/java.conf b/build/conf/java.conf index ec9b6d1138e..ff74aed92fc 100644 --- a/build/conf/java.conf +++ b/build/conf/java.conf @@ -829,7 +829,7 @@ module JAR_LIBRARY: _COMPILABLE_JAR_BASE { when ($WITH_KAPT_VALUE == "yes") { # For Kapt usage see: https://kotlinlang.org/docs/kapt.html#using-in-cli # See for kapt.kotlin.generated: https://github.com/JetBrains/kotlin/blob/master/plugins/kapt3/kapt3-cli/testData/integration/kotlinFileGeneration/build.txt - _KAPT_OPTS=-Xplugin=${tool:"contrib/java/org/jetbrains/kotlin/kotlin-annotation-processing/1.8.20"} $KT_KAPT_PLUGIN_OPTS + _KAPT_OPTS=-Xplugin=${tool:"contrib/java/org/jetbrains/kotlin/kotlin-annotation-processing/1.9.10"} $KT_KAPT_PLUGIN_OPTS _RUN_KAPT=${YMAKE_PYTHON} ${input:"build/scripts/with_kapt_args.py"} ${pre=--ap-classpath :KT_KAPT_AP_CLASSPATH} -- $COMPILE_KT $_KAPT_OPTS _APPEND_KAPT_GENERATED_SRCS=$YMAKE_PYTHON ${input:"build/scripts/resolve_java_srcs.py"} -d $KT_KAPT_SOURCES_DIR --include-patterns '**/*.java' '**/*.kt' --resolve-kotlin --append -s ${BINDIR}/all-java.srclst -k $KT_SRCLIST -r ${BINDIR}/not-used.txt @@ -1753,8 +1753,8 @@ macro WITH_KOTLINC_SERIALIZATION() { # tag:kotlin-specific ### Also search for _KAPT_OPTS and change version there -KOTLIN_VERSION=1.8.20 -KOTLIN_BOM_FILE=${ARCADIA_ROOT}/contrib/java/org/jetbrains/kotlin/kotlin-bom/1.8.20/ya.dependency_management.inc +KOTLIN_VERSION=1.9.10 +KOTLIN_BOM_FILE=${ARCADIA_ROOT}/contrib/java/org/jetbrains/kotlin/kotlin-bom/1.9.10/ya.dependency_management.inc GROOVY_VERSION=3.0.5 # tag:java-specific @@ -1868,10 +1868,10 @@ KOTLIN_JVM_TARGET= when ($JDK_REAL_VERSION == "8") { KOTLIN_JVM_TARGET=1.8 } -elsewhen ($JDK_REAL_VERSION == "20") { - # remove when kotlin starts supporting jdk20 bytecode +elsewhen ($JDK_REAL_VERSION == "21") { + # remove when kotlin starts supporting jdk21 bytecode # see also devtools/ya/jbuild/gen/actions/idea.py - KOTLIN_JVM_TARGET=19 + KOTLIN_JVM_TARGET=20 } otherwise { KOTLIN_JVM_TARGET=$JDK_REAL_VERSION |