Library import 240926-1443

build/conf/a.yaml

@@ -7,7 +7,7 @@ arcanum:
         requirements:
           - system: arcanum
             type: merge_time_fits
-            alias: Merge time intervals (YMAKE-1194)
+            alias: Merge is forbidden from 11:00 to 20:00 MSK (YMAKE-1194)
             data:
                 merge_intervals_utc:
                   # 20:00..11:00 MSK

build/conf/go.conf

@@ -816,6 +816,7 @@ module GO_LIBRARY: _GO_BASE_UNIT {
     SET(MODULE_TYPE LIBRARY)
     SET(PEERDIR_TAGS GO GO_PROTO GO_FBS __EMPTY__ RESOURCE_LIB PACKAGE_UNION)
 
+    _MAKEFILE_INCLUDE_LIKE_DEPS+=.yo.snapshot.json
     MODULE_SUFFIX=.a
 }
 

build/conf/java.conf

@@ -472,7 +472,7 @@ when($JDK_VERSION == "8") {
 }
 
 # tag:java-specific
-JDK_LATEST_VERSION=22
+JDK_LATEST_VERSION=23
 JDK_LATEST_PEERDIR=build/platform/java/jdk/jdk${JDK_LATEST_VERSION}
 
 # tag:java-specific
@@ -1074,6 +1074,13 @@ module JAR_LIBRARY: _COMPILABLE_JAR_BASE {
         when($WITH_KOTLINC_PLUGIN_SERIALIZATION) {
             KOTLINC_OPTS_VALUE+=-Xplugin=${KOTLIN_COMPILER_RESOURCE_GLOBAL}/plugins/kotlin-serialization-plugin.jar
         }
+        when($WITH_KOTLINC_PLUGIN_DETEKT) {
+            KOTLINC_OPTS_VALUE+=-Xplugin=${tool:"devtools/detekt-compiler-plugin"}
+            KOTLINC_OPTS_VALUE+=-P plugin:detekt-compiler-plugin:report=xml:${BINDIR}/misc/detekt-report.xml
+            # If there are no kt sources, the report won't be generated, however the file must be always present.
+            ALL_KT_COMMANDS+=&& $YMAKE_PYTHON ${input:"build/scripts/touch.py"} ${BINDIR}/misc/detekt-report.xml
+            ALL_KT_COMMANDS+=&& $FS_TOOLS copy ${BINDIR}/misc/detekt-report.xml ${output;noauto:"detekt-report.xml"}
+        }
         # Must be in sync with KT_CLASSES_DIR!
         # There are problems in JDK13 with abs paths in classpath baked into jar file manifest. Using relative path
         # here assumes that jar file with classpath for javac located in the $ARCADIA_BUILD_ROOT
@@ -1147,6 +1154,11 @@ module JAR_LIBRARY: _COMPILABLE_JAR_BASE {
         JAVAC_OPTS+=$ERROR_PRONE_JDK16PLUS_ADD_OPENS
     }
 
+    when($ERROR_PRONE_VALUE && $JDK_REAL_VERSION == "23") {
+        JAVAC_FLAGS_VALUE+=$ERROR_PRONE_JDK16PLUS_ADD_OPENS
+        JAVAC_OPTS+=$ERROR_PRONE_JDK16PLUS_ADD_OPENS
+    }
+
     when($ERROR_PRONE_VALUE && $ERROR_PRONE_VERSION == "2.7.1") {
         JAVAC_FLAGS_VALUE+=$ERROR_PRONE_2_7_1_FORCED_OPTS
         JAVAC_OPTS+=$ERROR_PRONE_2_7_1_FORCED_OPTS
@@ -1165,6 +1177,7 @@ module JAR_LIBRARY: _COMPILABLE_JAR_BASE {
     ENABLE(YMAKE_JAVA_TEST)
     _ADD_KOTLIN_STYLE_CHECKS($(BUILD_ROOT)/$MODDIR/all-kt-sources.txt REQUIREMENTS cpu:2)
     _ADD_JAVA_STYLE_CHECKS($(BUILD_ROOT)/$MODDIR/lint-java.srclst::$(SOURCE_ROOT))
+    _ADD_DETEKT_REPORT_CHECK($(BUILD_ROOT)/$MODDIR/detekt-report.xml)
     _ADD_CLASSPATH_CLASH_CHECK()
     JAVA_MODULE()
 }
@@ -1284,7 +1297,10 @@ JAVA_SWIG_DELIM=JAVA_SWIG_DELIM
 JDK_REAL_VERSION=
 JDK_VERSION=
 
-when ($JDK_VERSION == "22") {
+when ($JDK_VERSION == "23") {
+    JDK_REAL_VERSION=23
+}
+elsewhen ($JDK_VERSION == "22") {
     JDK_REAL_VERSION=22
 }
 elsewhen ($JDK_VERSION == "21") {
@@ -1312,6 +1328,9 @@ when ($USE_SYSTEM_JDK) {
     JDK_RESOURCE_PEERDIR=
 }
 otherwise {
+    when ($JDK_REAL_VERSION == "23") {
+        JDK_RESOURCE_PEERDIR=build/platform/java/jdk/jdk23 build/platform/java/jdk/jdk17
+    }
     when ($JDK_REAL_VERSION == "22") {
         JDK_RESOURCE_PEERDIR=build/platform/java/jdk/jdk22 build/platform/java/jdk/jdk17
     }
@@ -1331,6 +1350,9 @@ otherwise {
 }
 
 # tag:java-specific
+when ($JDK_REAL_VERSION == "23") {
+    UBERJAR_RESOURCE_PEERDIR=build/platform/java/uberjar/uberjar23
+}
 when ($JDK_REAL_VERSION == "22") {
     UBERJAR_RESOURCE_PEERDIR=build/platform/java/uberjar/uberjar22
 }
@@ -1353,6 +1375,9 @@ when ($USE_SYSTEM_JDK) {
     JDK_RESOURCE=$USE_SYSTEM_JDK
 }
 otherwise {
+    when ($JDK_REAL_VERSION == "23") {
+        JDK_RESOURCE=$JDK23_RESOURCE_GLOBAL
+    }
     when ($JDK_REAL_VERSION == "22") {
         JDK_RESOURCE=$JDK22_RESOURCE_GLOBAL
     }
@@ -1398,6 +1423,11 @@ when (!$USE_SYSTEM_ERROR_PRONE) {
         ERROR_PRONE_PEERDIR=build/platform/java/error_prone/2.30.0
         ERROR_PRONE_RESOURCE=$ERROR_PRONE_2_30_0_RESOURCE_GLOBAL
     }
+    elsewhen ($JDK_REAL_VERSION == "23") {
+        ERROR_PRONE_VERSION=2.30.0
+        ERROR_PRONE_PEERDIR=build/platform/java/error_prone/2.30.0
+        ERROR_PRONE_RESOURCE=$ERROR_PRONE_2_30_0_RESOURCE_GLOBAL
+    }
     otherwise {
         ERROR_PRONE_VERSION=2.7.1
         ERROR_PRONE_PEERDIR=build/platform/java/error_prone
@@ -1415,6 +1445,9 @@ when ($USE_SYSTEM_UBERJAR) {
     UBERJAR_RESOURCE=$USE_SYSTEM_UBERJAR
 }
 otherwise {
+    when ($JDK_REAL_VERSION == "23") {
+        UBERJAR_RESOURCE=$UBERJAR23_RESOURCE_GLOBAL
+    }
     when ($JDK_REAL_VERSION == "22") {
         UBERJAR_RESOURCE=$UBERJAR22_RESOURCE_GLOBAL
     }
@@ -1433,6 +1466,9 @@ otherwise {
 }
 
 # tag:java-specific
+when ($JDK_REAL_VERSION == "23") {
+    WITH_JDK_RESOURCE=$WITH_JDK23_RESOURCE_GLOBAL
+}
 when ($JDK_REAL_VERSION == "22") {
     WITH_JDK_RESOURCE=$WITH_JDK22_RESOURCE_GLOBAL
 }
@@ -1937,20 +1973,35 @@ macro WITH_KOTLINC_SERIALIZATION() {
     SET(_WITH_KOTLINC_PLUGIN_SERIALIZATION_SEM && with_kotlinc_plugin_serialization)
 }
 
+# tag:kotlin-specific
+WITH_KOTLINC_PLUGIN_DETEKT=
+_WITH_KOTLINC_PLUGIN_DETEKT_SEM=
+### @usage: WITH_KOTLINC_DETEKT(-flags)
+###
+### Enable detekt kotlin compiler plugin https://detekt.dev/docs/gettingstarted/compilerplugin/
+macro WITH_KOTLINC_DETEKT(Options...) {
+    SET_APPEND(KOTLINC_OPTS_VALUE ${pre=-P plugin\:detekt-compiler-plugin\::Options})
+    SET(WITH_KOTLINC_PLUGIN_DETEKT yes)
+    SET(_WITH_KOTLINC_PLUGIN_DETEKT_SEM && with_kotlinc_plugin_detekt)
+}
+
+
 # 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
 GROOVY_VERSION=3.0.5
+DETEKT_VERSION=1.23.7
 
 _KOTLIN_SEM= \
     ${_WITH_KOTLIN_SEM} \
     ${_KOTLIN_VERSION_SEM} \
     ${_WITH_KOTLINC_PLUGIN_ALLOPEN_SEM} \
     ${_WITH_KOTLINC_PLUGIN_LOMBOK_SEM} \
     ${_WITH_KOTLINC_PLUGIN_NOARG_SEM} \
-    ${_WITH_KOTLINC_PLUGIN_SERIALIZATION_SEM}
+    ${_WITH_KOTLINC_PLUGIN_SERIALIZATION_SEM} \
+    ${_WITH_KOTLINC_PLUGIN_DETEKT_SEM}
 
 
 _JAVA_PROTO_GRPC_SEM=
@@ -2083,6 +2134,11 @@ elsewhen ($JDK_REAL_VERSION == "22") {
     # see also devtools/ya/jbuild/gen/actions/idea.py
     KOTLIN_JVM_TARGET=21
 }
+elsewhen ($JDK_REAL_VERSION == "23") {
+    # remove when kotlin starts supporting jdk21 bytecode
+    # see also devtools/ya/jbuild/gen/actions/idea.py
+    KOTLIN_JVM_TARGET=21
+}
 otherwise {
     KOTLIN_JVM_TARGET=$JDK_REAL_VERSION
 }

build/conf/linkers/ld.conf

@@ -141,9 +141,8 @@ when ($TIME_TRACE_GRANULARITY && $TIME_TRACE_GRANULARITY != "") {
 _LINKER_TIME_TRACE_FLAG=
 when (($TIME_TRACE == "yes" || $LINKER_TIME_TRACE == "yes") && $_DEFAULT_LINKER_ID == "lld") {
     _LINKER_TIME_TRACE_FLAG=\
-        -Wl,--time-trace \
-        -Wl,--time-trace-granularity=$_LINKER_TIME_TRACE_GRANULARITY \
-        -Wl,--time-trace-file=${rootrel;output;pre=$MODULE_PREFIX;suf=$MODULE_SUFFIX.time_trace.json:REALPRJNAME}
+        -Wl,--time-trace=${rootrel;output;pre=$MODULE_PREFIX;suf=$MODULE_SUFFIX.time_trace.json:REALPRJNAME} \
+        -Wl,--time-trace-granularity=$_LINKER_TIME_TRACE_GRANULARITY
 }
 
 _EXE_FLAGS=\

build/conf/linkers/msvc_linker.conf

@@ -1,5 +1,5 @@
-LINK_EXE_CMD=${_WINE_LINK_PREFIX} ${_MSVC_LINK_OLD}
-LINK_LIB_CMD=${_WINE_LIB_PREFIX} ${_MSVC_LIB_OLD}
+LINK_EXE_CMD=${_WINE_LINK_PREFIX} ${_MSVC_LINK}
+LINK_LIB_CMD=${_WINE_LIB_PREFIX} ${_MSVC_LIB}
 
 _MSVC_ARCH=
 when ($ARCH_I386 == "yes" || $ARCH_I686 == "yes") {
@@ -46,9 +46,9 @@ when (!$NO_DEBUGINFO || $NO_DEBUGINFO == "no" || $NO_DEBUGINFO == "0") {
 _FLAGS_COMMON_LIBPATHS=
 when ($IDE_MSVS != "yes") {
     _FLAGS_COMMON_LIBPATHS=\
-        /LIBPATH:\"${quo:_MSVC_TC_KIT_LIBS}/um/$_MSVC_ARCH\" \
-        /LIBPATH:\"${quo:_MSVC_TC_KIT_LIBS}/ucrt/$_MSVC_ARCH\" \
-        /LIBPATH:\"${quo:_MSVC_TC_VC_ROOT}/lib/$_MSVC_ARCH\"
+        /LIBPATH:\""${_MSVC_TC_KIT_LIBS}/um/$_MSVC_ARCH"\" \
+        /LIBPATH:\""${_MSVC_TC_KIT_LIBS}/ucrt/$_MSVC_ARCH"\" \
+        /LIBPATH:\""${_MSVC_TC_VC_ROOT}/lib/$_MSVC_ARCH"\"
 }
 
 _FLAGS_COMMON =/NOLOGO /ERRORREPORT:PROMPT /SUBSYSTEM:CONSOLE /TLBID:1 $MSVC_DYNAMICBASE /NXCOMPAT
@@ -107,7 +107,7 @@ OBJADDE_LIB_GLOBAL=
 
 LINK_EXE_FLAGS=$LINK_EXE_FLAGS_PER_TYPE
 LINK_EXE_VFS_FLAGS=
-when ($_UNDER_WINE_LINK != "yes") {
+when ($_UNDER_WINE_LINK != "yes" && $USE_MSVC_LINKER != "yes") {
     LINK_EXE_VFS_FLAGS=/vfsoverlay:${BINDIR}/vfsoverlay.yaml
 }
 LINK_EXE_FLAGS+=${LINK_EXE_VFS_FLAGS}
@@ -118,7 +118,7 @@ GENERATE_COMMON_LIB_VFS_CMD=\
     ${_FLAGS_COMMON_LIBPATHS}
 
 GENERATE_COMMON_LIB_VFS=
-when ($_UNDER_WINE_LINK != "yes") {
+when ($_UNDER_WINE_LINK != "yes" && $USE_MSVC_LINKER != "yes") {
     GENERATE_COMMON_LIB_VFS=${GENERATE_COMMON_LIB_VFS_CMD}
 }
 

build/conf/python.conf

@@ -179,9 +179,10 @@ macro NO_YMAKE_PYTHON3() {
     SET(YMAKE_PYTHON3_PEERDIR)
 }
 
+PYTHON_LINTERS_DEFAULT_CONFIGS=build/config/tests/py_style/default_configs.json
+
 FLAKE_EXTRA_PARAMS=
 FLAKE_MIGRATIONS_CONFIG=
-FLAKE_CONFIG_FILES=build/config/tests/flake8/flake8.conf $FLAKE_MIGRATIONS_CONFIG
 when ($DISABLE_FLAKE8_MIGRATIONS == "yes") {
     FLAKE_EXTRA_PARAMS="DISABLE_FLAKE8_MIGRATIONS=yes"
 }
@@ -265,40 +266,54 @@ multimodule PY3_PROGRAM {
     }
 }
 
+# tag:python-specific tag:internal
+### @usage: _ADD_PY_LINTER_CHECK(NAME name LINTER linter [DEPENDS deps] CONFIGS configs_file [GLOBAL_RESOURCES gr] [FILE_PROCESSING_TIME fpt] [EXTRA_PARAMS params] [PROJECT_TO_CONFIG_MAP pcm] [FLAKE_MIGRATIONS_CONFIG fmc] [CUSTOM_CONFIG cc])
+###
+### Triggers respective plugin
+macro _ADD_PY_LINTER_CHECK(Args...) {
+    SET_APPEND(_MAKEFILE_INCLUDE_LIKE_DEPS ${ARCADIA_ROOT}/${PYTHON_LINTERS_DEFAULT_CONFIGS})
+}
+
+# tag:python-specific tag:internal
+### @usage: STYLE_DUMMY()
+###
+### Not an actual linter, used for dummy linter demonstration
+macro STYLE_DUMMY() {
+    _ADD_PY_LINTER_CHECK(NAME dummy_linter LINTER tools/dummy_linter/dummy_linter CONFIGS $PYTHON_LINTERS_DEFAULT_CONFIGS)
+}
+
 # tag:python-specific tag:test
 ### @usage: STYLE_PYTHON([pyproject])
 ###
 ### Check python3 sources for style issues using black.
-BLACK_CONFIG_FILES=
 macro STYLE_PYTHON(pyproject...) {
-    BLACK_CONFIG_FILES=$pyproject build/config/tests/py_style/config.toml
-    _ADD_PY_LINTER_CHECK(NAME black LINTER tools/black_linter/black_linter FILE_PROCESSING_TIME $BLACK_FILE_PROCESSING_TIME CONFIGS $BLACK_CONFIG_FILES)
+    _ADD_PY_LINTER_CHECK(NAME black LINTER tools/black_linter/black_linter FILE_PROCESSING_TIME $BLACK_FILE_PROCESSING_TIME CONFIGS $PYTHON_LINTERS_DEFAULT_CONFIGS CUSTOM_CONFIG $pyproject)
 }
 
 # tag:python-specific tag:test
 ### @usage: STYLE_RUFF()
 ###
 ### Check python3 sources for style issues using ruff.
-RUFF_CONFIG_PATHS_FILE=build/config/tests/ruff/ruff_config_paths.json
+RUFF_PROJECT_TO_CONFIG_MAP=build/config/tests/ruff/ruff_config_paths.json
 macro STYLE_RUFF() {
-    SET_APPEND(_MAKEFILE_INCLUDE_LIKE_DEPS ${ARCADIA_ROOT}/${RUFF_CONFIG_PATHS_FILE})
-    _ADD_PY_LINTER_CHECK(NAME ruff LINTER tools/ruff_linter/bin/ruff_linter GLOBAL_RESOURCES build/external_resources/ruff CONFIGS $RUFF_CONFIG_PATHS_FILE)
+    SET_APPEND(_MAKEFILE_INCLUDE_LIKE_DEPS ${ARCADIA_ROOT}/${RUFF_PROJECT_TO_CONFIG_MAP})
+    _ADD_PY_LINTER_CHECK(NAME ruff LINTER tools/ruff_linter/bin/ruff_linter GLOBAL_RESOURCES build/external_resources/ruff CONFIGS $PYTHON_LINTERS_DEFAULT_CONFIGS PROJECT_TO_CONFIG_MAP $RUFF_PROJECT_TO_CONFIG_MAP)
 }
 
 # tag:python-specific tag:test
 ### @usage: STYLE_FLAKE8()
 ###
 ### Check python3 sources for style issues using flake8.
 macro STYLE_FLAKE8() {
-    _ADD_PY_LINTER_CHECK(NAME flake8 LINTER tools/flake8_linter/flake8_linter GLOBAL_RESOURCES build/external_resources/flake8_py3 FILE_PROCESSING_TIME $FLAKE8_FILE_PROCESSING_TIME CONFIGS $FLAKE_CONFIG_FILES EXTRA_PARAMS $FLAKE_EXTRA_PARAMS)
+    _ADD_PY_LINTER_CHECK(NAME flake8 LINTER tools/flake8_linter/flake8_linter GLOBAL_RESOURCES build/external_resources/flake8_py3 FILE_PROCESSING_TIME $FLAKE8_FILE_PROCESSING_TIME CONFIGS $PYTHON_LINTERS_DEFAULT_CONFIGS FLAKE_MIGRATIONS_CONFIG $FLAKE_MIGRATIONS_CONFIG EXTRA_PARAMS $FLAKE_EXTRA_PARAMS)
 }
 
 # tag:python-specific tag:test
 ### @usage: STYLE_PY2_FLAKE8()
 ###
 ### Check python3 sources for style issues using flake8.
 macro STYLE_PY2_FLAKE8() {
-    _ADD_PY_LINTER_CHECK(NAME py2_flake8 LINTER tools/flake8_linter/flake8_linter GLOBAL_RESOURCES build/external_resources/flake8_py2 FILE_PROCESSING_TIME $FLAKE8_FILE_PROCESSING_TIME CONFIGS $FLAKE_CONFIG_FILES EXTRA_PARAMS $FLAKE_EXTRA_PARAMS)
+    _ADD_PY_LINTER_CHECK(NAME py2_flake8 LINTER tools/flake8_linter/flake8_linter GLOBAL_RESOURCES build/external_resources/flake8_py2 FILE_PROCESSING_TIME $FLAKE8_FILE_PROCESSING_TIME CONFIGS $PYTHON_LINTERS_DEFAULT_CONFIGS FLAKE_MIGRATIONS_CONFIG $FLAKE_MIGRATIONS_CONFIG EXTRA_PARAMS $FLAKE_EXTRA_PARAMS)
 }
 
 # tag:python-specific tag:test

build/conf/settings.conf

@@ -14,14 +14,11 @@ FORCE_RESOLVE_MACRO_INCLS=yes
 ENABLE_RERESOLVE_FOR_GENERATED_FILES=yes
 REPORT_ALL_DUPSRC=yes
 DEPS_CACHE_CONTROL_UIDS_CACHE=yes
-INCLUDE_BLACKLIST_TO_CONF_HASH=no
-INCLUDE_ISOLATED_PROJECTS_TO_CONF_HASH=no
-USE_GRAND_BYPASS=no
 USE_GLOBAL_CMD=yes
 YMAKE_USE_NEW_UIDS=yes
-USE_GRAPH_CHANGES_PREDICTOR=yes
 PIC_NO_PIE=no
 FAIL_PY2=no
+MAIN_OUTPUT_AS_EXTRA=no
 
 when ($YMAKE_USE_OLD_UIDS == "yes") {
     YMAKE_USE_NEW_UIDS=no
@@ -32,7 +29,6 @@ when ($OS_WINDOWS == "yes") {
 }
 
 when ($AUTOCHECK == "yes") {
-    USE_GRAPH_CHANGES_PREDICTOR=no
     PIC_NO_PIE=yes
 }
 

build/config/tests/py_style/default_configs.json

@@ -0,0 +1,6 @@
+{
+    "flake8": "build/config/tests/flake8/flake8.conf",
+    "py2_flake8": "build/config/tests/flake8/flake8.conf",
+    "black": "build/config/tests/py_style/config.toml",
+    "dummy_linter": "build/config/tests/py_style/dummy_linter_config.json"
+}

build/config/tests/py_style/dummy_linter_config.json

@@ -0,0 +1 @@
+{}

build/config/tests/py_style/ya.make

@@ -2,7 +2,6 @@ LIBRARY()
 
 RESOURCE_FILES(
     config.toml
-    config_paths.json
 )
 
 END()

build/export_generators/cmake/cmake/conan-profiles/android.arm64.profile

@@ -11,5 +11,3 @@ os.api_level=21
 [tool_requires]
 android-ndk/r25
 [options]
-[env]
-

build/export_generators/cmake/cmake/conan-profiles/android.armv7.profile

@@ -11,5 +11,3 @@ os.api_level=21
 [tool_requires]
 android-ndk/r25
 [options]
-[env]
-

build/export_generators/cmake/cmake/conan-profiles/android.x86.profile

@@ -11,5 +11,3 @@ os.api_level=21
 [tool_requires]
 android-ndk/r25
 [options]
-[env]
-

build/export_generators/cmake/cmake/conan-profiles/android.x86_64.profile

@@ -11,5 +11,3 @@ os.api_level=21
 [tool_requires]
 android-ndk/r25
 [options]
-[env]
-