diff options
| author | pazus <[email protected]> | 2024-03-13 17:21:34 +0300 |
|---|---|---|
| committer | pazus <[email protected]> | 2024-03-13 17:34:52 +0300 |
| commit | 7eae4ffeba222a4785fad6a8cc4d9884e0bbc60e (patch) | |
| tree | 2c8ba4c9760847ad640da0ac41749285bef474f4 | |
| parent | 24ae9da923df78e9797360c2514ead5910cf22b9 (diff) | |
Update Kotlin to 1.9.23
bfde3ba44523dafa144e9e5cdd39955a3d3feb98
| -rw-r--r-- | build/conf/java.conf | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/build/conf/java.conf b/build/conf/java.conf index d044be58655..1f39cde36fe 100644 --- a/build/conf/java.conf +++ b/build/conf/java.conf @@ -961,7 +961,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.20"} $KT_KAPT_PLUGIN_OPTS + _KAPT_OPTS=-Xplugin=${tool:"contrib/java/org/jetbrains/kotlin/kotlin-annotation-processing/1.9.23"} $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 @@ -1867,8 +1867,8 @@ macro WITH_KOTLINC_SERIALIZATION() { # tag:kotlin-specific ### Also search for _KAPT_OPTS and change version there -KOTLIN_VERSION=1.9.20 -KOTLIN_BOM_FILE=${ARCADIA_ROOT}/contrib/java/org/jetbrains/kotlin/kotlin-bom/1.9.20/ya.dependency_management.inc +KOTLIN_VERSION=1.9.23 +KOTLIN_BOM_FILE=${ARCADIA_ROOT}/contrib/java/org/jetbrains/kotlin/kotlin-bom/1.9.23/ya.dependency_management.inc GROOVY_VERSION=3.0.5 _KOTLIN_SEM= \ |