diff options
| author | pazus <pazus@yandex-team.ru> | 2022-02-10 16:51:38 +0300 |
|---|---|---|
| committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:51:38 +0300 |
| commit | c76a613c348512a52e08f1cafa17780dad0490f5 (patch) | |
| tree | ab7fbbf3253d4c0e2793218f09378908beb025fb /build | |
| parent | 34f17a82a8817cfc83b81b4bb14991dfaba7b639 (diff) | |
| download | ydb-c76a613c348512a52e08f1cafa17780dad0490f5.tar.gz | |
Restoring authorship annotation for <pazus@yandex-team.ru>. Commit 2 of 2.
Diffstat (limited to 'build')
| -rw-r--r-- | build/platform/java/kotlin/ya.make | 24 | ||||
| -rw-r--r-- | build/ymake.core.conf | 16 |
2 files changed, 20 insertions, 20 deletions
diff --git a/build/platform/java/kotlin/ya.make b/build/platform/java/kotlin/ya.make index dd1d03a101..b4c0b0b83a 100644 --- a/build/platform/java/kotlin/ya.make +++ b/build/platform/java/kotlin/ya.make @@ -8,22 +8,22 @@ ELSEIF(KOTLIN_VERSION == "1.3.72") ELSEIF(KOTLIN_VERSION == "1.4.0") DECLARE_EXTERNAL_RESOURCE(KOTLIN_COMPILER sbr:1708283452) ELSEIF(KOTLIN_VERSION == "1.4.10") - DECLARE_EXTERNAL_RESOURCE(KOTLIN_COMPILER sbr:1730522145) + DECLARE_EXTERNAL_RESOURCE(KOTLIN_COMPILER sbr:1730522145) ELSEIF(KOTLIN_VERSION == "1.4.20") - DECLARE_EXTERNAL_RESOURCE(KOTLIN_COMPILER sbr:1869719387) -ELSEIF(KOTLIN_VERSION == "1.4.30") - DECLARE_EXTERNAL_RESOURCE(KOTLIN_COMPILER sbr:1974389794) -ELSEIF(KOTLIN_VERSION == "1.5.10") + DECLARE_EXTERNAL_RESOURCE(KOTLIN_COMPILER sbr:1869719387) +ELSEIF(KOTLIN_VERSION == "1.4.30") + DECLARE_EXTERNAL_RESOURCE(KOTLIN_COMPILER sbr:1974389794) +ELSEIF(KOTLIN_VERSION == "1.5.10") DECLARE_EXTERNAL_RESOURCE(KOTLIN_COMPILER sbr:2183338194) ELSEIF(KOTLIN_VERSION == "1.5.20") DECLARE_EXTERNAL_RESOURCE(KOTLIN_COMPILER sbr:2257446523) -ELSEIF(KOTLIN_VERSION == "1.5.21") - DECLARE_EXTERNAL_RESOURCE(KOTLIN_COMPILER sbr:2285312314) -ELSEIF(KOTLIN_VERSION == "1.5.30") - DECLARE_EXTERNAL_RESOURCE(KOTLIN_COMPILER sbr:2382793744) -ELSEIF(KOTLIN_VERSION == "1.5.31") - DECLARE_EXTERNAL_RESOURCE(KOTLIN_COMPILER sbr:2444978303) -ELSEIF(KOTLIN_VERSION == "1.6.10") +ELSEIF(KOTLIN_VERSION == "1.5.21") + DECLARE_EXTERNAL_RESOURCE(KOTLIN_COMPILER sbr:2285312314) +ELSEIF(KOTLIN_VERSION == "1.5.30") + DECLARE_EXTERNAL_RESOURCE(KOTLIN_COMPILER sbr:2382793744) +ELSEIF(KOTLIN_VERSION == "1.5.31") + DECLARE_EXTERNAL_RESOURCE(KOTLIN_COMPILER sbr:2444978303) +ELSEIF(KOTLIN_VERSION == "1.6.10") DECLARE_EXTERNAL_RESOURCE(KOTLIN_COMPILER sbr:2754878302) ELSE() MESSAGE(FATAL_ERROR Unexpected KOTLIN_VERSION ${KOTLIN_VERSION}) diff --git a/build/ymake.core.conf b/build/ymake.core.conf index d373db6565..081833998b 100644 --- a/build/ymake.core.conf +++ b/build/ymake.core.conf @@ -4803,7 +4803,7 @@ macro WITH_GROOVY() { } # tag:kotlin-specific -KOTLINC_FLAGS_VALUE=-Xjvm-default=all +KOTLINC_FLAGS_VALUE=-Xjvm-default=all ### @usage: KOTLINC_FLAGS(-flags) ### ### Set additional Kotlin compilation flags. @@ -4815,7 +4815,7 @@ macro KOTLINC_FLAGS(Args...) { WITH_KOTLINC_PLUGIN_ALLOPEN= ### @usage: WITH_KOTLINC_ALLOPEN(-flags) ### -### Enable allopen kotlin compiler plugin https://kotlinlang.org/docs/all-open-plugin.html +### Enable allopen kotlin compiler plugin https://kotlinlang.org/docs/all-open-plugin.html macro WITH_KOTLINC_ALLOPEN(Options...) { SET_APPEND(KOTLINC_OPTS_VALUE ${pre=-P plugin\:org.jetbrains.kotlin.allopen\::Options}) SET(WITH_KOTLINC_PLUGIN_ALLOPEN yes) @@ -4832,8 +4832,8 @@ macro WITH_KOTLINC_NOARG(Options...) { } # tag:kotlin-specific -KOTLIN_VERSION=1.6.10 -KOTLIN_BOM_FILE=${ARCADIA_ROOT}/contrib/java/org/jetbrains/kotlin/kotlin-bom/1.6.10/ya.dependency_management.inc +KOTLIN_VERSION=1.6.10 +KOTLIN_BOM_FILE=${ARCADIA_ROOT}/contrib/java/org/jetbrains/kotlin/kotlin-bom/1.6.10/ya.dependency_management.inc GROOVY_VERSION=3.0.5 # tag:java-specific @@ -8950,10 +8950,10 @@ KOTLIN_JVM_TARGET= when ($JDK_VERSION == "8") { KOTLIN_JVM_TARGET=1.8 } -elsewhen ($JDK_VERSION == "18") { - # remove when kotlin starts supporting jdk18 bytecode - # see also devtools/ya/jbuild/gen/actions/idea.py - KOTLIN_JVM_TARGET=17 +elsewhen ($JDK_VERSION == "18") { + # remove when kotlin starts supporting jdk18 bytecode + # see also devtools/ya/jbuild/gen/actions/idea.py + KOTLIN_JVM_TARGET=17 } otherwise { KOTLIN_JVM_TARGET=$JDK_VERSION |