diff options
| author | daniel-march <daniel-march@yandex-team.com> | 2023-10-12 19:24:17 +0300 |
|---|---|---|
| committer | daniel-march <daniel-march@yandex-team.com> | 2023-10-12 19:46:16 +0300 |
| commit | a133fc1e8d404578f74f39162e63f4a5fd8d4c5a (patch) | |
| tree | 9454ac2c77e6cf4860c697036ba490a64963037c | |
| parent | 8826ac90645f5ed29970591c779c0d62d27433a7 (diff) | |
| download | ydb-a133fc1e8d404578f74f39162e63f4a5fd8d4c5a.tar.gz | |
Added "USE_KTLINT_OLD" macro support
| -rw-r--r-- | build/conf/java.conf | 12 | ||||
| -rw-r--r-- | build/plugins/ytest.py | 2 |
2 files changed, 13 insertions, 1 deletions
diff --git a/build/conf/java.conf b/build/conf/java.conf index ff74aed92fc..4e9dcffddb7 100644 --- a/build/conf/java.conf +++ b/build/conf/java.conf @@ -727,7 +727,7 @@ module _COMPILABLE_JAR_BASE : _JAR_BASE { # kotlin DEPENDENCY_MANAGEMENT($_KOTLIN_ALLOWED_VERSIONS) - + CHECK_DEPENDENT_DIRS(DENY PEERDIRS contrib/java/org/jetbrains/kotlin/kotlin-stdlib EXCEPT contrib/java/org/jetbrains/kotlin/kotlin-stdlib/${KOTLIN_VERSION}) CHECK_DEPENDENT_DIRS(DENY PEERDIRS contrib/java/org/jetbrains/kotlin/kotlin-stdlib-jdk7 EXCEPT contrib/java/org/jetbrains/kotlin/kotlin-stdlib-jdk7/${KOTLIN_VERSION}) CHECK_DEPENDENT_DIRS(DENY PEERDIRS contrib/java/org/jetbrains/kotlin/kotlin-stdlib-jdk8 EXCEPT contrib/java/org/jetbrains/kotlin/kotlin-stdlib-jdk8/${KOTLIN_VERSION}) @@ -1892,3 +1892,13 @@ macro JDK_VERSION(Arg) { USE_SYSTEM_JDK= USE_SYSTEM_UBERJAR= USE_SYSTEM_ERROR_PRONE= + +# tag:kotlin-specific +_USE_KTLINT_OLD=no + +# tag:kotlin-specific +### @usage: USE_KTLINT_OLD() +### Marks that need use the old version of ktlint +macro USE_KTLINT_OLD() { + ENABLE(_USE_KTLINT_OLD) +} diff --git a/build/plugins/ytest.py b/build/plugins/ytest.py index 664539e9d69..2aed37e2057 100644 --- a/build/plugins/ytest.py +++ b/build/plugins/ytest.py @@ -641,6 +641,8 @@ def onadd_check(unit, *args): fork_mode = unit.get('TEST_FORK_MODE') or '' elif check_type == "ktlint": test_timeout = '120' + ktlint_binary = '$(KTLINT_OLD)/run.bat' if unit.get('_USE_KTLINT_OLD') == 'yes' else '$(KTLINT)/run.bat' + extra_test_dart_data['KTLINT_BINARY'] = ktlint_binary elif check_type == "JAVA_STYLE": if ymake_java_test and not unit.get('ALL_SRCDIRS') or '': return |