Skip to content

Commit 6314869

Browse files
author
pazus
committed
Update kotlin 2.1.20
commit_hash:67570c566c9fee8a7a0ea247ea8906bade519784
1 parent 099240b commit 6314869

File tree

2 files changed

+21
-16
lines changed

2 files changed

+21
-16
lines changed

‎build/conf/java.conf

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1051,7 +1051,7 @@ module JAR_LIBRARY: _COMPILABLE_JAR_BASE {
10511051
when ($WITH_KAPT_VALUE == "yes") {
10521052
# For Kapt usage see: https://kotlinlang.org/docs/kapt.html#using-in-cli
10531053
# See for kapt.kotlin.generated: https://github.com/JetBrains/kotlin/blob/master/plugins/kapt3/kapt3-cli/testData/integration/kotlinFileGeneration/build.txt
1054-
_KAPT_OPTS=-Xplugin=${tool:"contrib/java/org/jetbrains/kotlin/kotlin-annotation-processing/2.0.21"} $KT_KAPT_PLUGIN_OPTS
1054+
_KAPT_OPTS=-Xplugin=${tool:"contrib/java/org/jetbrains/kotlin/kotlin-annotation-processing/2.1.20"} $KT_KAPT_PLUGIN_OPTS
10551055
_RUN_KAPT=${YMAKE_PYTHON} ${input:"build/scripts/with_kapt_args.py"} --ap-classpath ${KT_KAPT_AP_CLASSPATH} -- $COMPILE_KT $_KAPT_OPTS
10561056
_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
10571057

@@ -2035,9 +2035,10 @@ macro WITH_KOTLINC_DETEKT(Options...) {
20352035

20362036
# tag:kotlin-specific
20372037
### Also search for _KAPT_OPTS and change version there
2038-
_KOTLIN_VERSION=2.0.21
2039-
KOTLIN_VERSION=2.0.21
2040-
KOTLIN_BOM_FILE=${ARCADIA_ROOT}/contrib/java/org/jetbrains/kotlin/kotlin-bom/2.0.21/ya.dependency_management.inc
2038+
### change supported jvmTarget in https://a.yandex-team.ru/arcadia/devtools/ya/jbuild/gen/actions/idea.py?rev=r16258919#L668
2039+
_KOTLIN_VERSION=2.1.20
2040+
KOTLIN_VERSION=2.1.20
2041+
KOTLIN_BOM_FILE=${ARCADIA_ROOT}/contrib/java/org/jetbrains/kotlin/kotlin-bom/2.1.20/ya.dependency_management.inc
20412042
DETEKT_VERSION=1.23.7
20422043

20432044
_KOTLIN_SEM= \
@@ -2164,20 +2165,10 @@ KOTLIN_JVM_TARGET=
21642165
when ($JDK_REAL_VERSION == "8") {
21652166
KOTLIN_JVM_TARGET=1.8
21662167
}
2167-
elsewhen ($JDK_REAL_VERSION == "22") {
2168-
# remove when kotlin starts supporting jdk21 bytecode
2169-
# see also devtools/ya/jbuild/gen/actions/idea.py
2170-
KOTLIN_JVM_TARGET=21
2171-
}
2172-
elsewhen ($JDK_REAL_VERSION == "23") {
2173-
# remove when kotlin starts supporting jdk21 bytecode
2174-
# see also devtools/ya/jbuild/gen/actions/idea.py
2175-
KOTLIN_JVM_TARGET=21
2176-
}
21772168
elsewhen ($JDK_REAL_VERSION == "24") {
2178-
# remove when kotlin starts supporting jdk21 bytecode
2169+
# remove when kotlin starts supporting jdk24 bytecode
21792170
# see also devtools/ya/jbuild/gen/actions/idea.py
2180-
KOTLIN_JVM_TARGET=21
2171+
KOTLIN_JVM_TARGET=23
21812172
}
21822173
otherwise {
21832174
KOTLIN_JVM_TARGET=$JDK_REAL_VERSION

‎build/mapping.conf.json

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,14 +68,20 @@
6868
"6638629972": "{registry_endpoint}/6638629972",
6969
"7245028676": "{registry_endpoint}/7245028676",
7070
"7245028547": "{registry_endpoint}/7245028547",
71+
"8314755214": "{registry_endpoint}/8314755214",
72+
"8314760034": "{registry_endpoint}/8314760034",
7173
"6638916300": "{registry_endpoint}/6638916300",
7274
"6638917016": "{registry_endpoint}/6638917016",
7375
"7245028516": "{registry_endpoint}/7245028516",
7476
"7245028641": "{registry_endpoint}/7245028641",
77+
"8314760058": "{registry_endpoint}/8314760058",
78+
"8314762661": "{registry_endpoint}/8314762661",
7579
"6638915855": "{registry_endpoint}/6638915855",
7680
"6638914429": "{registry_endpoint}/6638914429",
7781
"7245029625": "{registry_endpoint}/7245029625",
7882
"7245029630": "{registry_endpoint}/7245029630",
83+
"8314758936": "{registry_endpoint}/8314758936",
84+
"8314762236": "{registry_endpoint}/8314762236",
7985
"721500304": "{registry_endpoint}/721500304",
8086
"3573990573": "{registry_endpoint}/3573990573",
8187
"3573996018": "{registry_endpoint}/3573996018",
@@ -1049,6 +1055,7 @@
10491055
"1812152858": "{registry_endpoint}/1812152858",
10501056
"6639202855": "{registry_endpoint}/6639202855",
10511057
"7249973735": "{registry_endpoint}/7249973735",
1058+
"8314768876": "{registry_endpoint}/8314768876",
10521059
"4758626187": "{registry_endpoint}/4758626187",
10531060
"4758626560": "{registry_endpoint}/4758626560",
10541061
"4758626176": "{registry_endpoint}/4758626176",
@@ -1390,14 +1397,20 @@
13901397
"6638629972": "JAVA_LIBRARY-none-none-kotlin-stdlib-1.9.24.jar",
13911398
"7245028676": "JAVA_LIBRARY-none-none-kotlin-stdlib-2.0.21-sources.jar",
13921399
"7245028547": "JAVA_LIBRARY-none-none-kotlin-stdlib-2.0.21.jar",
1400+
"8314755214": "JAVA_LIBRARY-none-none-kotlin-stdlib-2.1.20-sources.jar",
1401+
"8314760034": "JAVA_LIBRARY-none-none-kotlin-stdlib-2.1.20.jar",
13931402
"6638916300": "JAVA_LIBRARY-none-none-kotlin-stdlib-jdk7-1.9.24-sources.jar",
13941403
"6638917016": "JAVA_LIBRARY-none-none-kotlin-stdlib-jdk7-1.9.24.jar",
13951404
"7245028516": "JAVA_LIBRARY-none-none-kotlin-stdlib-jdk7-2.0.21-sources.jar",
13961405
"7245028641": "JAVA_LIBRARY-none-none-kotlin-stdlib-jdk7-2.0.21.jar",
1406+
"8314760058": "JAVA_LIBRARY-none-none-kotlin-stdlib-jdk7-2.1.20-sources.jar",
1407+
"8314762661": "JAVA_LIBRARY-none-none-kotlin-stdlib-jdk7-2.1.20.jar",
13971408
"6638915855": "JAVA_LIBRARY-none-none-kotlin-stdlib-jdk8-1.9.24-sources.jar",
13981409
"6638914429": "JAVA_LIBRARY-none-none-kotlin-stdlib-jdk8-1.9.24.jar",
13991410
"7245029625": "JAVA_LIBRARY-none-none-kotlin-stdlib-jdk8-2.0.21-sources.jar",
14001411
"7245029630": "JAVA_LIBRARY-none-none-kotlin-stdlib-jdk8-2.0.21.jar",
1412+
"8314758936": "JAVA_LIBRARY-none-none-kotlin-stdlib-jdk8-2.1.20-sources.jar",
1413+
"8314762236": "JAVA_LIBRARY-none-none-kotlin-stdlib-jdk8-2.1.20.jar",
14011414
"721500304": "JAVA_LIBRARY-none-none-listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar",
14021415
"3573990573": "JAVA_LIBRARY-none-none-proto-google-common-protos-2.9.0-sources.jar",
14031416
"3573996018": "JAVA_LIBRARY-none-none-proto-google-common-protos-2.9.0.jar",
@@ -2371,6 +2384,7 @@
23712384
"1812152858": "junk/zubchick/buf/buf for linux",
23722385
"6639202855": "kotlin_kompiler_1.9.24 with plugins",
23732386
"7249973735": "kotlin_kompiler_2.0.21 with plugins",
2387+
"8314768876": "kotlin_kompiler_2.1.20 with plugins",
23742388
"4758626187": "ktlint for darwin (0.50.0)",
23752389
"4758626560": "ktlint for darwin-arm64 (0.50.0)",
23762390
"4758626176": "ktlint for linux (0.50.0)",

0 commit comments

Comments
 (0)