aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormiroslav2 <miroslav2@yandex-team.com>2025-03-05 08:54:45 +0300
committermiroslav2 <miroslav2@yandex-team.com>2025-03-05 09:19:01 +0300
commiteb6162648d609b51e071e090db75fdcfc8d726c4 (patch)
tree31c5b7aa2aeef7b388f235098d63d48362e0f163
parent78e8655f82daee0ed66a7018c578039f834a39ef (diff)
downloadydb-eb6162648d609b51e071e090db75fdcfc8d726c4.tar.gz
Переход в Аркадии на Kotlin 2.0.21
Если вас попросили помочь с PR нужно делать так: 1) чекаутим ветку этого PR 2) Делаем изменение в модуле, добиваясь, что тесты проходят в ветке 3) `arc submit --new -m "Подготовка к Kotlin 2.1"` тем самым изменения будут перенесены в отдельную ветку, которая когда вмержится этот Pr на нее поребейзится <section id="quibbler-autodescription"> #### Обновление Kotlin до версии 2.0.21 📝 - 🔄 Обновлен плагин Kotlin для использования версии 2.0.21. - 📝 Обновлены зависимости и конфигурации для поддержки новой версии Kotlin. </section> commit_hash:c4b10591fa4add0fea63c3659ad2b38fd23b21a9
-rw-r--r--build/conf/java.conf8
-rw-r--r--build/mapping.conf.json14
2 files changed, 18 insertions, 4 deletions
diff --git a/build/conf/java.conf b/build/conf/java.conf
index f6612dd059d..3e777439666 100644
--- a/build/conf/java.conf
+++ b/build/conf/java.conf
@@ -1047,7 +1047,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.24"} $KT_KAPT_PLUGIN_OPTS
+ _KAPT_OPTS=-Xplugin=${tool:"contrib/java/org/jetbrains/kotlin/kotlin-annotation-processing/2.0.21"} $KT_KAPT_PLUGIN_OPTS
_RUN_KAPT=${YMAKE_PYTHON} ${input:"build/scripts/with_kapt_args.py"} --ap-classpath ${KT_KAPT_AP_CLASSPATH} -- $COMPILE_KT $_KAPT_OPTS
_APPEND_KAPT_GENERATED_SRCS=$YMAKE_PYTHON3 ${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
@@ -1989,9 +1989,9 @@ macro WITH_KOTLINC_DETEKT(Options...) {
# tag:kotlin-specific
### Also search for _KAPT_OPTS and change version there
-_KOTLIN_VERSION=1.9.24
-KOTLIN_VERSION=1.9.24
-KOTLIN_BOM_FILE=${ARCADIA_ROOT}/contrib/java/org/jetbrains/kotlin/kotlin-bom/1.9.24/ya.dependency_management.inc
+_KOTLIN_VERSION=2.0.21
+KOTLIN_VERSION=2.0.21
+KOTLIN_BOM_FILE=${ARCADIA_ROOT}/contrib/java/org/jetbrains/kotlin/kotlin-bom/2.0.21/ya.dependency_management.inc
DETEKT_VERSION=1.23.7
_KOTLIN_SEM= \
diff --git a/build/mapping.conf.json b/build/mapping.conf.json
index 51df82af275..d4327902240 100644
--- a/build/mapping.conf.json
+++ b/build/mapping.conf.json
@@ -66,10 +66,16 @@
"545709491": "{registry_endpoint}/545709491",
"6638626363": "{registry_endpoint}/6638626363",
"6638629972": "{registry_endpoint}/6638629972",
+ "7245028676": "{registry_endpoint}/7245028676",
+ "7245028547": "{registry_endpoint}/7245028547",
"6638916300": "{registry_endpoint}/6638916300",
"6638917016": "{registry_endpoint}/6638917016",
+ "7245028516": "{registry_endpoint}/7245028516",
+ "7245028641": "{registry_endpoint}/7245028641",
"6638915855": "{registry_endpoint}/6638915855",
"6638914429": "{registry_endpoint}/6638914429",
+ "7245029625": "{registry_endpoint}/7245029625",
+ "7245029630": "{registry_endpoint}/7245029630",
"721500304": "{registry_endpoint}/721500304",
"3573990573": "{registry_endpoint}/3573990573",
"3573996018": "{registry_endpoint}/3573996018",
@@ -996,6 +1002,7 @@
"1277521710": "{registry_endpoint}/1277521710",
"1812152858": "{registry_endpoint}/1812152858",
"6639202855": "{registry_endpoint}/6639202855",
+ "7249973735": "{registry_endpoint}/7249973735",
"4758626187": "{registry_endpoint}/4758626187",
"4758626560": "{registry_endpoint}/4758626560",
"4758626176": "{registry_endpoint}/4758626176",
@@ -1326,10 +1333,16 @@
"545709491": "JAVA_LIBRARY-none-none-javax.annotation-api-1.3.1.jar",
"6638626363": "JAVA_LIBRARY-none-none-kotlin-stdlib-1.9.24-sources.jar",
"6638629972": "JAVA_LIBRARY-none-none-kotlin-stdlib-1.9.24.jar",
+ "7245028676": "JAVA_LIBRARY-none-none-kotlin-stdlib-2.0.21-sources.jar",
+ "7245028547": "JAVA_LIBRARY-none-none-kotlin-stdlib-2.0.21.jar",
"6638916300": "JAVA_LIBRARY-none-none-kotlin-stdlib-jdk7-1.9.24-sources.jar",
"6638917016": "JAVA_LIBRARY-none-none-kotlin-stdlib-jdk7-1.9.24.jar",
+ "7245028516": "JAVA_LIBRARY-none-none-kotlin-stdlib-jdk7-2.0.21-sources.jar",
+ "7245028641": "JAVA_LIBRARY-none-none-kotlin-stdlib-jdk7-2.0.21.jar",
"6638915855": "JAVA_LIBRARY-none-none-kotlin-stdlib-jdk8-1.9.24-sources.jar",
"6638914429": "JAVA_LIBRARY-none-none-kotlin-stdlib-jdk8-1.9.24.jar",
+ "7245029625": "JAVA_LIBRARY-none-none-kotlin-stdlib-jdk8-2.0.21-sources.jar",
+ "7245029630": "JAVA_LIBRARY-none-none-kotlin-stdlib-jdk8-2.0.21.jar",
"721500304": "JAVA_LIBRARY-none-none-listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar",
"3573990573": "JAVA_LIBRARY-none-none-proto-google-common-protos-2.9.0-sources.jar",
"3573996018": "JAVA_LIBRARY-none-none-proto-google-common-protos-2.9.0.jar",
@@ -2256,6 +2269,7 @@
"1277521710": "infra/kernel/tools/atop/build/atop-static.tar.gz",
"1812152858": "junk/zubchick/buf/buf for linux",
"6639202855": "kotlin_kompiler_1.9.24 with plugins",
+ "7249973735": "kotlin_kompiler_2.0.21 with plugins",
"4758626187": "ktlint for darwin (0.50.0)",
"4758626560": "ktlint for darwin-arm64 (0.50.0)",
"4758626176": "ktlint for linux (0.50.0)",