|
@@ -859,7 +859,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.9.10"} $KT_KAPT_PLUGIN_OPTS
|
|
|
+ _KAPT_OPTS=-Xplugin=${tool:"contrib/java/org/jetbrains/kotlin/kotlin-annotation-processing/1.9.20"} $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
|
|
|
|
|
@@ -1778,8 +1778,8 @@ macro WITH_KOTLINC_SERIALIZATION() {
|
|
|
|
|
|
# tag:kotlin-specific
|
|
|
### Also search for _KAPT_OPTS and change version there
|
|
|
-KOTLIN_VERSION=1.9.10
|
|
|
-KOTLIN_BOM_FILE=${ARCADIA_ROOT}/contrib/java/org/jetbrains/kotlin/kotlin-bom/1.9.10/ya.dependency_management.inc
|
|
|
+KOTLIN_VERSION=1.9.20
|
|
|
+KOTLIN_BOM_FILE=${ARCADIA_ROOT}/contrib/java/org/jetbrains/kotlin/kotlin-bom/1.9.20/ya.dependency_management.inc
|
|
|
GROOVY_VERSION=3.0.5
|
|
|
|
|
|
# tag:java-specific
|
|
@@ -1890,10 +1890,10 @@ KOTLIN_JVM_TARGET=
|
|
|
when ($JDK_REAL_VERSION == "8") {
|
|
|
KOTLIN_JVM_TARGET=1.8
|
|
|
}
|
|
|
-elsewhen ($JDK_REAL_VERSION == "21") {
|
|
|
+elsewhen ($JDK_REAL_VERSION == "22") {
|
|
|
# remove when kotlin starts supporting jdk21 bytecode
|
|
|
# see also devtools/ya/jbuild/gen/actions/idea.py
|
|
|
- KOTLIN_JVM_TARGET=20
|
|
|
+ KOTLIN_JVM_TARGET=21
|
|
|
}
|
|
|
otherwise {
|
|
|
KOTLIN_JVM_TARGET=$JDK_REAL_VERSION
|